From patchwork Fri May 5 10:38:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 98611 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp50113qge; Fri, 5 May 2017 03:40:25 -0700 (PDT) X-Received: by 10.237.53.124 with SMTP id b57mr39646927qte.240.1493980825327; Fri, 05 May 2017 03:40:25 -0700 (PDT) Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x134si4355229qka.214.2017.05.05.03.40.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 05 May 2017 03:40:25 -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; dkim=fail header.i=@linaro.org; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:46175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6aes-0003m9-Oh for patch@linaro.org; Fri, 05 May 2017 06:40:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52611) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d6acR-0001ml-Uw for qemu-devel@nongnu.org; Fri, 05 May 2017 06:37:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d6acQ-0006mC-VG for qemu-devel@nongnu.org; Fri, 05 May 2017 06:37:51 -0400 Received: from mail-wm0-x231.google.com ([2a00:1450:400c:c09::231]:38084) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1d6acQ-0006ku-PC for qemu-devel@nongnu.org; Fri, 05 May 2017 06:37:50 -0400 Received: by mail-wm0-x231.google.com with SMTP id 142so2195740wma.1 for ; Fri, 05 May 2017 03:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=uEH+K4irOp7LRSuvkX7MT2Qak9ld7gQVKrCmdAfzJyM=; b=LGQtevDTY1BJXnaEsq4Zc+erpD/iT9tdaPMYTaYZiEGGcnQwGzOodZuMz5RdLHyz9L wecuYRtKhBK58V86CgyMb3TBaPzLG+OYOTvkXWWVla4PpeqcagV2qBpa7WeHYn4uxqCR 4BhcTRBofbE5lrVJBnRI8YMYJozwVpSo5oW84= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=uEH+K4irOp7LRSuvkX7MT2Qak9ld7gQVKrCmdAfzJyM=; b=Q2araSteUzjw0tG5Qc3I5IgH/wKQ/NhtHJJ7mS2H4w39KRyEWST1wTGsWWLhDSozr8 ovRjNOATkYDQ0kjsnc4CmAU8J8jVQ9BKMczGOynepPJUjBQEkYHWuP2Z68Y/MFOuXldf S1+UD3cZTb40mB5U0CW0dwTP2Gtqvt/DKNQAjYZUlOyTpc/b3ObuZ10Mmw5rchHtfLNE HeOLtKBccPg8/vSBRVVhUnweTIewZCOw1PmerZ75Clc7snc3msCmoXV2T57xgcbyvRgi nnfioeeh9nrhbLm2klHvZM6fJMs9BIoaJFY+D4xcL0KXVV/4tqCOS0AWPO6oV65cTYZr 7thA== X-Gm-Message-State: AN3rC/6iHrUlDaJI4l9jmoL2JUeRAjV1pL7GqjLANjU3LOqNNFw3+I4b dxFz2bqCn2Bh+Iia X-Received: by 10.28.156.206 with SMTP id f197mr4688736wme.40.1493980669655; Fri, 05 May 2017 03:37:49 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t2sm1789279wme.16.2017.05.05.03.37.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 May 2017 03:37:48 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 4CF773E023D; Fri, 5 May 2017 11:38:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: pbonzini@redhat.com, boost.lists@gmail.com, pavel.dovgaluk@ispras.ru Date: Fri, 5 May 2017 11:38:21 +0100 Message-Id: <20170505103822.20641-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170505103822.20641-1-alex.bennee@linaro.org> References: <20170505103822.20641-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::231 Subject: [Qemu-devel] [RFC PATCH v1 8/9] util/qemu-thread-*: add qemu_lock, locked and unlock trace events 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: cota@braap.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- include/qemu/thread.h | 7 +++++-- util/qemu-thread-posix.c | 11 +++++++++-- util/trace-events | 5 +++++ 3 files changed, 19 insertions(+), 4 deletions(-) -- 2.11.0 diff --git a/include/qemu/thread.h b/include/qemu/thread.h index 9910f49b3a..ddea4990c0 100644 --- a/include/qemu/thread.h +++ b/include/qemu/thread.h @@ -22,9 +22,12 @@ typedef struct QemuThread QemuThread; void qemu_mutex_init(QemuMutex *mutex); void qemu_mutex_destroy(QemuMutex *mutex); -void qemu_mutex_lock(QemuMutex *mutex); int qemu_mutex_trylock(QemuMutex *mutex); -void qemu_mutex_unlock(QemuMutex *mutex); +void qemu_mutex_lock_impl(QemuMutex *mutex, const char *file, const int line); +void qemu_mutex_unlock_impl(QemuMutex *mutex, const char *file, const int line); + +#define qemu_mutex_lock(mutex) qemu_mutex_lock_impl(mutex, __FILE__, __LINE__) +#define qemu_mutex_unlock(mutex) qemu_mutex_unlock_impl(mutex, __FILE__, __LINE__) /* Prototypes for other functions are in thread-posix.h/thread-win32.h. */ void qemu_rec_mutex_init(QemuRecMutex *mutex); diff --git a/util/qemu-thread-posix.c b/util/qemu-thread-posix.c index 73e3a0edf5..9da1c9e756 100644 --- a/util/qemu-thread-posix.c +++ b/util/qemu-thread-posix.c @@ -14,6 +14,7 @@ #include "qemu/thread.h" #include "qemu/atomic.h" #include "qemu/notify.h" +#include "trace.h" static bool name_threads; @@ -53,13 +54,17 @@ void qemu_mutex_destroy(QemuMutex *mutex) error_exit(err, __func__); } -void qemu_mutex_lock(QemuMutex *mutex) +void qemu_mutex_lock_impl(QemuMutex *mutex, const char *file, const int line) { int err; + trace_qemu_mutex_lock(mutex, file, line); + err = pthread_mutex_lock(&mutex->lock); if (err) error_exit(err, __func__); + + trace_qemu_mutex_locked(mutex, file, line); } int qemu_mutex_trylock(QemuMutex *mutex) @@ -67,13 +72,15 @@ int qemu_mutex_trylock(QemuMutex *mutex) return pthread_mutex_trylock(&mutex->lock); } -void qemu_mutex_unlock(QemuMutex *mutex) +void qemu_mutex_unlock_impl(QemuMutex *mutex, const char *file, const int line) { int err; err = pthread_mutex_unlock(&mutex->lock); if (err) error_exit(err, __func__); + + trace_qemu_mutex_unlock(mutex, file, line); } void qemu_rec_mutex_init(QemuRecMutex *mutex) diff --git a/util/trace-events b/util/trace-events index b44ef4f895..972d7e1786 100644 --- a/util/trace-events +++ b/util/trace-events @@ -34,6 +34,11 @@ qemu_co_mutex_lock_return(void *mutex, void *self) "mutex %p self %p" qemu_co_mutex_unlock_entry(void *mutex, void *self) "mutex %p self %p" qemu_co_mutex_unlock_return(void *mutex, void *self) "mutex %p self %p" +# util/qemu-thread.c +qemu_mutex_lock(void *mutex, const char *file, const int line) "waiting on mutex %p (%s:%d)" +qemu_mutex_locked(void *mutex, const char *file, const int line) "taken mutex %p (%s:%d)" +qemu_mutex_unlock(void *mutex, const char *file, const int line) "released mutex %p (%s:%d)" + # util/oslib-win32.c # util/oslib-posix.c qemu_memalign(size_t alignment, size_t size, void *ptr) "alignment %zu size %zu ptr %p"