From patchwork Thu Feb 10 17:37:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 82635 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 78D75B7109 for ; Fri, 11 Feb 2011 04:45:33 +1100 (EST) Received: from localhost ([127.0.0.1]:44011 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pnaa9-0001AR-Pv for incoming@patchwork.ozlabs.org; Thu, 10 Feb 2011 12:45:30 -0500 Received: from [140.186.70.92] (port=36864 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PnaT2-0006hd-BZ for qemu-devel@nongnu.org; Thu, 10 Feb 2011 12:38:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PnaT0-0004V6-RP for qemu-devel@nongnu.org; Thu, 10 Feb 2011 12:38:08 -0500 Received: from mail-yw0-f45.google.com ([209.85.213.45]:56929) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PnaT0-0004U4-Kx for qemu-devel@nongnu.org; Thu, 10 Feb 2011 12:38:06 -0500 Received: by mail-yw0-f45.google.com with SMTP id 8so759395ywa.4 for ; Thu, 10 Feb 2011 09:38:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:sender:from:to:cc:subject:date:message-id :x-mailer:in-reply-to:references; bh=YNA8Icqul2Nryp20cCNQ9dcMcBnHQ6dx2r7B8rEf5V0=; b=Q/weTtLzZCJB1ONsLF3xmN8Be6BlaR0f4mWXfljs1b1S63T6seMgrCr5wtEueyeogh Px0XDHyCd/miSwmEOmXWQ7jZouRBTYcoADxT1A86MagStyj/X5r8sRNNI8wfUqtsIChE 3IakR29Uu54w7eOTj6aGUO0IJJ3giW5gs/1VE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=oBnq0E8Joa2LduJt9Ddh7+NwIsjZf9DYQ7n7ufJmofE+C7A4gx3AL6NQ4Dn8ppceoA QRfE9V2vwzO6fAkRfmmPaPGtrziYtmSJ8XVltivntq7YfHs1XE1Q/Ev2UZPU5cCKJBp7 ZYmOQxm1cRgUMX0KIpWHAmD1vnU/lHTrK+ml0= Received: by 10.236.110.14 with SMTP id t14mr2289926yhg.57.1297359486228; Thu, 10 Feb 2011 09:38:06 -0800 (PST) Received: from localhost.localdomain (93-34-149-100.ip50.fastwebnet.it [93.34.149.100]) by mx.google.com with ESMTPS id 66sm140033yhl.46.2011.02.10.09.38.04 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Feb 2011 09:38:05 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 10 Feb 2011 18:37:43 +0100 Message-Id: <1297359464-9789-7-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.3.5 In-Reply-To: <1297359464-9789-1-git-send-email-pbonzini@redhat.com> References: <1297359464-9789-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.213.45 Cc: Blue Swirl Subject: [Qemu-devel] [PATCH 6/7] add assertions on the owner of a QemuMutex X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These are already present in the Win32 implementation, add them to the pthread wrappers as well. Signed-off-by: Paolo Bonzini Cc: Stefan Weil Cc: Blue Swirl --- qemu-thread-posix.c | 20 +++++++++++++++++++- qemu-thread-posix.h | 1 + 2 files changed, 20 insertions(+), 1 deletions(-) diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c index fbc78fe..e6cafd9 100644 --- a/qemu-thread-posix.c +++ b/qemu-thread-posix.c @@ -16,9 +16,12 @@ #include #include #include +#include #include #include "qemu-thread.h" +static pthread_t pthread_null; + static void error_exit(int err, const char *msg) { fprintf(stderr, "qemu: %s: %s\n", msg, strerror(err)); @@ -29,6 +32,7 @@ void qemu_mutex_init(QemuMutex *mutex) { int err; + mutex->owner = pthread_null; err = pthread_mutex_init(&mutex->lock, NULL); if (err) error_exit(err, __func__); @@ -48,13 +52,22 @@ void qemu_mutex_lock(QemuMutex *mutex) int err; err = pthread_mutex_lock(&mutex->lock); + assert (pthread_equal(mutex->owner, pthread_null)); + mutex->owner = pthread_self(); if (err) error_exit(err, __func__); } int qemu_mutex_trylock(QemuMutex *mutex) { - return pthread_mutex_trylock(&mutex->lock); + int err; + err = pthread_mutex_trylock(&mutex->lock); + if (err == 0) { + assert (pthread_equal(mutex->owner, pthread_null)); + mutex->owner = pthread_self(); + } + + return !!err; } static void timespec_add_ms(struct timespec *ts, uint64_t msecs) @@ -85,6 +98,8 @@ void qemu_mutex_unlock(QemuMutex *mutex) { int err; + assert (pthread_equal(mutex->owner, pthread_self())); + mutex->owner = pthread_null; err = pthread_mutex_unlock(&mutex->lock); if (err) error_exit(err, __func__); @@ -130,7 +145,10 @@ void qemu_cond_wait(QemuCond *cond, QemuMutex *mutex) { int err; + assert (pthread_equal(mutex->owner, pthread_self())); + mutex->owner = pthread_null; err = pthread_cond_wait(&cond->cond, &mutex->lock); + mutex->owner = pthread_self(); if (err) error_exit(err, __func__); } diff --git a/qemu-thread-posix.h b/qemu-thread-posix.h index 7af371c..11978db 100644 --- a/qemu-thread-posix.h +++ b/qemu-thread-posix.h @@ -4,6 +4,7 @@ struct QemuMutex { pthread_mutex_t lock; + pthread_t owner; }; struct QemuCond {