From mboxrd@z Thu Jan 1 00:00:00 1970 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) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 10 Feb 2011 18:37:43 +0100 Message-Id: <1297359464-9789-7-git-send-email-pbonzini@redhat.com> In-Reply-To: <1297359464-9789-1-git-send-email-pbonzini@redhat.com> References: <1297359464-9789-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 6/7] add assertions on the owner of a QemuMutex List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Blue Swirl 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 { -- 1.7.3.5