From patchwork Wed Feb 7 12:04:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 127166 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp414223ljc; Wed, 7 Feb 2018 04:17:22 -0800 (PST) X-Google-Smtp-Source: AH8x224E3RZry/qRyicA/+vV9u2rCGyQuhreQRql+rnuhGs94DDVUfMrk3kJlLV5FcaizXlIYqTg X-Received: by 10.129.113.11 with SMTP id m11mr3591798ywc.240.1518005842056; Wed, 07 Feb 2018 04:17:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518005842; cv=none; d=google.com; s=arc-20160816; b=TqwzzmXeKZL4kQKJZ46hnBYCQtcd0dOEVmFV03M43eDKw/1jqWSNBQeoBKXiuZPDUw YMmE23ft61Ua2PV1/7GJd0kDv2FgwE/RggLAJUzV4mAhKqWxMNBRWx0+aQIr2LBuoMZ7 c+RHku8IX7JyfqmqSu3gcHzrH4e13enTv5e2uy9Bodaqo/iReH+00Vz2t3l5D+slvmqa BCjcbXU8meD1QjE9KB5ybdQCZfX4MFenh3uqCA6zcOOdwRy+pcTboL/ZfTMhuSjeqFPD gmxKtuZ8z0qqE4eslWS14C71raoBzRRHbSVCxt2H4t0STKZsvrP9fGI56cYjB21dXR77 KqqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:user-agent:references :in-reply-to:message-id:date:to:from:arc-authentication-results; bh=NxMPn59v/BPXue/8zD6loH8ClpLPxi3WzX9vp/j/45w=; b=j9QLsmHt8dVukgeF3WP3kkZiXIfr58o/F7v+pl+c9I7hsyxQZPFnM2wwXaIeO66Czt BrF23Ou1cIMHXaJK//ZE7NfYCzK9VXsnUNEpRAEiiLUCi3c+j1JJmjOKtAoHF5mJhL+w on1K4Hs5cVruhYi0akYAMM2IRxS2nkNffEHsVkCLt3FXVMDPGAI0f2Soa9TT6EHaOtP/ mxAl20aek7Hr8hIWhNxzvbusE9eLDHlTOJBou4AIUEaMMRYE7nCfYvUV58lo9WGzh/kZ Y86KEerzyPkIsmpwyAiJPantbc5CzqRZQvGhVc1YsMO3fCVRwQLlYu+jJFzZcgCDVLUF OCLQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j129si227809ywe.198.2018.02.07.04.17.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 07 Feb 2018 04:17:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org Received: from localhost ([::1]:57045 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejOfB-0002M2-Ac for patch@linaro.org; Wed, 07 Feb 2018 07:17:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejOTC-0000fb-OB for qemu-devel@nongnu.org; Wed, 07 Feb 2018 07:04:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejOT8-0004EG-0c for qemu-devel@nongnu.org; Wed, 07 Feb 2018 07:04:58 -0500 Received: from mail.ispras.ru ([83.149.199.45]:47520) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejOT7-0004Dy-PS for qemu-devel@nongnu.org; Wed, 07 Feb 2018 07:04:53 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id CD52E54008B; Wed, 7 Feb 2018 15:04:52 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Wed, 07 Feb 2018 15:04:55 +0300 Message-ID: <20180207120455.5389.32155.stgit@pasha-VirtualBox> In-Reply-To: <20180207120353.5389.54531.stgit@pasha-VirtualBox> References: <20180207120353.5389.54531.stgit@pasha-VirtualBox> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [RFC PATCH v6 11/20] replay/replay-internal.c: track holding of replay_lock 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: kwolf@redhat.com, peter.maydell@linaro.org, war2jordan@live.com, pavel.dovgaluk@ispras.ru, quintela@redhat.com, ciro.santilli@gmail.com, jasowang@redhat.com, mst@redhat.com, zuban32s@gmail.com, maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru, kraxel@redhat.com, boost.lists@gmail.com, thomas.dullien@googlemail.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée This is modelled after the iothread mutex lock. We keep a TLS flag to indicate when that thread has acquired the lock and assert we don't double-lock or release when we shouldn't have. Signed-off-by: Alex Bennée Tested-by: Pavel Dovgalyuk --- replay/replay-internal.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/replay/replay-internal.c b/replay/replay-internal.c index fca8514..0d7e1d6 100644 --- a/replay/replay-internal.c +++ b/replay/replay-internal.c @@ -169,6 +169,8 @@ void replay_finish_event(void) replay_fetch_data_kind(); } +static __thread bool replay_locked; + void replay_mutex_init(void) { qemu_mutex_init(&lock); @@ -179,13 +181,22 @@ void replay_mutex_destroy(void) qemu_mutex_destroy(&lock); } +static bool replay_mutex_locked(void) +{ + return replay_locked; +} + void replay_mutex_lock(void) { + g_assert(!replay_mutex_locked()); qemu_mutex_lock(&lock); + replay_locked = true; } void replay_mutex_unlock(void) { + g_assert(replay_mutex_locked()); + replay_locked = false; qemu_mutex_unlock(&lock); }