From patchwork Tue Nov 14 08:17:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pavel Dovgalyuk X-Patchwork-Id: 118845 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp2763661qgn; Tue, 14 Nov 2017 00:25:26 -0800 (PST) X-Google-Smtp-Source: AGs4zMaYHvNnUpUuf7ebxMWdPMcTJTP2WzJFUNH7rR2apGckqMLbKVBtku0w1jLBxJ2tryVc2m75 X-Received: by 10.129.125.212 with SMTP id y203mr7128597ywc.510.1510647926092; Tue, 14 Nov 2017 00:25:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510647926; cv=none; d=google.com; s=arc-20160816; b=CmEwPtNW4bOssm0C5W4B50LKNinqpiBk09uD5BT0c3mx/KnLb5OAt0YYT1og8zF7ee aymmq8/M1ID3vHRcu7Oewl8A0DINMwYtT87N/S8EenyXvUIiC9A+wgMNbnMKmKy5bdUx gOOOdHx7kHGdyDouOa9rcXbbpEn3c+VxU4CNnYG7umFIFWxkRYqDoqHRM2bZRDW1MDZh 2LgVSw1jDfefRZ+/qkZ8u3dC0AfgSiW+X2wPcOYgQ5rRcHRS3cSUwKODPrD5CsMgYxTG uC6TDtymEga3hjplVt5xsm3OeRR7rvYw4H+bOxTMXrcC/MhtG7gy8NlyuBxOrqRHY1mB EkzQ== 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=eaWXh7eJ96bPE1dM/ljeqUReo1DLKNLjyU5VNVCDfdE=; b=vcrt/ckBwP4KdXr1xZG0nk+kLvHwOe+fKjoBSA3Xv/hf95lxtKEYaZCX7mdW1zPzmY H7krYke3MC5W0pTzoJZ9qgQkmI/7JyuaxO+vBhHCpRu3Bxi7oVPwN5f/6/cqOClJT5C1 xwB/0hyNMWC9F9zvI8/CclytgBOy9jHhWeqkfbVe7AudN33pN+SKwI6aoDcGs+7T5sNR k1ArSDt39/9vcxNmwt2bxe+UhIMu072g5TFxt/jkooSvI/vmUkustdTbi7FnvWx+dm8Z eTW1Y7BQM9WXpQP9N1qnK1AbLaSeI2IDuvv+ifX241fEKR/tVCec2RjVfwTkfOHWVI/s SVRw== 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 1si97927ywm.453.2017.11.14.00.25.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 14 Nov 2017 00:25:26 -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]:58192 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEWX7-0006nj-Im for patch@linaro.org; Tue, 14 Nov 2017 03:25:25 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40657) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEWPo-0000AX-C6 for qemu-devel@nongnu.org; Tue, 14 Nov 2017 03:17:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEWPk-0006cv-Db for qemu-devel@nongnu.org; Tue, 14 Nov 2017 03:17:52 -0500 Received: from mail.ispras.ru ([83.149.199.45]:52710) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEWPk-0006cN-6L for qemu-devel@nongnu.org; Tue, 14 Nov 2017 03:17:48 -0500 Received: from [127.0.1.1] (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id 4992154006A; Tue, 14 Nov 2017 11:17:47 +0300 (MSK) From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Tue, 14 Nov 2017 11:17:55 +0300 Message-ID: <20171114081755.27640.21686.stgit@pasha-VirtualBox> In-Reply-To: <20171114081630.27640.53933.stgit@pasha-VirtualBox> References: <20171114081630.27640.53933.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 v2 15/26] 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, pavel.dovgaluk@ispras.ru, mst@redhat.com, jasowang@redhat.com, quintela@redhat.com, zuban32s@gmail.com, maria.klimushenkova@ispras.ru, dovgaluk@ispras.ru, kraxel@redhat.com, boost.lists@gmail.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..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); }