From patchwork Tue May 10 09:16:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Changlong Xie X-Patchwork-Id: 9055741 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D672F9F1D3 for ; Tue, 10 May 2016 09:13:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 50FE12010E for ; Tue, 10 May 2016 09:13:35 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 72B76200E3 for ; Tue, 10 May 2016 09:13:34 +0000 (UTC) Received: from localhost ([::1]:45284 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b03jQ-0003nu-NV for patchwork-qemu-devel@patchwork.kernel.org; Tue, 10 May 2016 05:13:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b03jJ-0003kN-PD for qemu-devel@nongnu.org; Tue, 10 May 2016 05:13:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b03jF-0003Ff-GO for qemu-devel@nongnu.org; Tue, 10 May 2016 05:13:24 -0400 Received: from [59.151.112.132] (port=61012 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b03jE-0003De-FC for qemu-devel@nongnu.org; Tue, 10 May 2016 05:13:21 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="6393412" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 May 2016 17:13:06 +0800 Received: from G08CNEXCHPEKD03.g08.fujitsu.local (unknown [10.167.33.85]) by cn.fujitsu.com (Postfix) with ESMTP id 77BEF42B561F; Tue, 10 May 2016 17:13:03 +0800 (CST) Received: from changlox.g08.fujitsu.local (10.167.225.55) by G08CNEXCHPEKD03.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.279.2; Tue, 10 May 2016 17:13:03 +0800 From: Changlong Xie To: qemu devel , Stefan Hajnoczi Date: Tue, 10 May 2016 17:16:33 +0800 Message-ID: <1462871793-31561-1-git-send-email-xiecl.fnst@cn.fujitsu.com> X-Mailer: git-send-email 1.9.3 MIME-Version: 1.0 X-Originating-IP: [10.167.225.55] X-yoursite-MailScanner-ID: 77BEF42B561F.A1268 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: xiecl.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH] rfifolock: no need to get thread identifier when nesting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Changlong Xie Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Changlong Xie --- util/rfifolock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/rfifolock.c b/util/rfifolock.c index c22f5fe..f406cc1 100644 --- a/util/rfifolock.c +++ b/util/rfifolock.c @@ -50,6 +50,7 @@ void rfifolock_lock(RFifoLock *r) if (r->nesting > 0 && qemu_thread_is_self(&r->owner_thread)) { r->tail--; /* put ticket back, we're nesting */ + goto out; } else { while (ticket != r->head) { /* Invoke optional contention callback */ @@ -61,6 +62,7 @@ void rfifolock_lock(RFifoLock *r) } qemu_thread_get_self(&r->owner_thread); +out: r->nesting++; qemu_mutex_unlock(&r->lock); }