From patchwork Tue Oct 31 10:49:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 117569 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp3803737edm; Tue, 31 Oct 2017 04:02:45 -0700 (PDT) X-Google-Smtp-Source: ABhQp+Qc8I6lpCEZQXEKME+5LS3km6PnWuRqYlE8BuxgIdsr2kPzOKe0GbFVAfuGw/AJTreDLEHG X-Received: by 10.129.113.70 with SMTP id m67mr937378ywc.194.1509447765423; Tue, 31 Oct 2017 04:02:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509447765; cv=none; d=google.com; s=arc-20160816; b=GN1BQH6CpQscnmAECVSdPlyL2KVJLEzSguxN4Z+6D8ZMikgoaW4SziQxBR1cEHCWbs uB5UtAlz2DlhZv1XWVUZC7j7o3Cjw0w1FtKzvbs4Mwx4TGaPUnmyX21mGCSqi14TMeeu hkwanj1mLzCwcK166W0NckWEXEMbj0TptYk0pN/6iAdyHMckooSQbchwIH5ibJYVrf5F gemxAinoEKD41wnna9QYundYvPOq9I9GHBceLaWE8M1WgYkQTLdvIlkellizhj9Xu8CO +/ZC2StKtIBr2ttq2Z3/NqxmGGGDCV4wmC1FMwHIdjQVOQYvxtiI1VSjB0XBKL7XlXp1 IYlw== 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=ji+TDh6Qp4pi72Cdv6q4pbX1OtMqc/O6nIZ/IqRIz2Q=; b=Tb5ap2V3KhFaTCuLyeX4BvG+7v3V/AjyEwoTMk56MpSJ+JkWLWMvAwYvD40DpZmyoK GbqzegSxWAgQM9uAHDDYLJA3txFFczLEwVzL2tU22myBDzazzY4TDhFs98SoWsXWUYOc C8XM3MHIKILMWHj0PftZmNDiKpPedj29oAOJZNXEI7KR3W3ows5gGxgpmdP2ozdzGC4f yDBWGjRTTqcVuHzN4Pq1PK62ToefAWLFHgFOdUn/vJyYg6mXzdsbVleruWUuitRp/wb1 F/uhBSHgMdhnYGSkK8PQkABsaVWALbzJ6xR3eF+/boj49e8J0UCwfUbILtUBLVTWPorx RaYg== 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 x128si340732ywe.550.2017.10.31.04.02.45 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 31 Oct 2017 04:02:45 -0700 (PDT) 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]:44760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9UJg-0001HM-QB for patch@linaro.org; Tue, 31 Oct 2017 07:02:44 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9U6U-0006K1-7q for qemu-devel@nongnu.org; Tue, 31 Oct 2017 06:49:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e9U6Q-00057K-E9 for qemu-devel@nongnu.org; Tue, 31 Oct 2017 06:49:06 -0400 Received: from mail.ispras.ru ([83.149.199.45]:39982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9U6Q-00056G-6c for qemu-devel@nongnu.org; Tue, 31 Oct 2017 06:49:02 -0400 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 6E36154006A; Tue, 31 Oct 2017 13:49:01 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Tue, 31 Oct 2017 13:49:02 +0300 Message-ID: <20171031104902.3079.17066.stgit@pasha-VirtualBox> In-Reply-To: <20171031104741.3079.26584.stgit@pasha-VirtualBox> References: <20171031104741.3079.26584.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] [RFCPATCH15/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: dovgaluk@ispras.ru 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 Signed-off-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..157c863 100644 --- a/replay/replay-internal.c +++ b/replay/replay-internal.c @@ -179,13 +179,24 @@ void replay_mutex_destroy(void) qemu_mutex_destroy(&lock); } +static __thread bool replay_locked; + +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); }