From patchwork Sat Feb 26 15:40:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 84658 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 D8F82B70B3 for ; Sun, 27 Feb 2011 03:08:59 +1100 (EST) Received: from localhost ([127.0.0.1]:54644 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtMYS-0002Nd-Ug for incoming@patchwork.ozlabs.org; Sat, 26 Feb 2011 10:59:37 -0500 Received: from [140.186.70.92] (port=40582 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PtMG9-0002K6-I7 for qemu-devel@nongnu.org; Sat, 26 Feb 2011 10:40:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PtMG8-0007Vl-22 for qemu-devel@nongnu.org; Sat, 26 Feb 2011 10:40:41 -0500 Received: from mail-wy0-f173.google.com ([74.125.82.173]:42749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PtMG7-0007Qr-R9 for qemu-devel@nongnu.org; Sat, 26 Feb 2011 10:40:39 -0500 Received: by mail-wy0-f173.google.com with SMTP id 29so2615616wyb.4 for ; Sat, 26 Feb 2011 07:40:39 -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=7NcAWmrpnMS1WrEPdOGrwPpvHWkj2hiVjNDW+utWDfA=; b=W9O5lf0Lid99cuUprO/Tpm0tHt7ylQavdh4ylpyMT7H5f5ZR+EktH9Z9qf1JNaH3bF NFLHXTqktz8nLnru4MZ9J6dwMlBlDXnVWLcKuFvZFwraDqAsZ6bMVvNoyjj1JHuhEPEL mXn239BOV70k5xEVNYZSXP+uyHeR/KS93hcIU= 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=DANcAVC1bpMhwyC6QqyBN31MtLP1cEelVlmr6ePzEOqj5gX2kqEQ7M9x+3lJms3X/7 oa7WrfKsuBjQjJc0aHsSfRkeOw4MKNRFntzcYKiHEHbNkwEjGHzN8V+BLDWIr0iXCaOS zpG0q18s3eY8mAqoKo7JQZyZMeXcBlHlr3MZ4= Received: by 10.227.143.206 with SMTP id w14mr3254038wbu.66.1298734839213; Sat, 26 Feb 2011 07:40:39 -0800 (PST) Received: from localhost.localdomain (93-34-149-100.ip50.fastwebnet.it [93.34.149.100]) by mx.google.com with ESMTPS id f27sm1592788wbf.1.2011.02.26.07.40.36 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 26 Feb 2011 07:40:37 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 26 Feb 2011 16:40:04 +0100 Message-Id: <1298734819-1960-8-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.4 In-Reply-To: <1298734819-1960-1-git-send-email-pbonzini@redhat.com> References: <1298734819-1960-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Cc: jan.kiszka@siemens.com, aurelien@aurel32.net Subject: [Qemu-devel] [PATCH v2 upstream 07/22] 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. Use PTHREAD_MUTEX_ERRORCHECK for mutex operations, and track the owner separately for cond_signal/broadcast. Signed-off-by: Paolo Bonzini --- qemu-thread-posix.c | 23 +++++++++++++++++++++-- qemu-thread-posix.h | 1 + 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c index e307773..a4c6e25 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)); @@ -28,8 +31,13 @@ static void error_exit(int err, const char *msg) void qemu_mutex_init(QemuMutex *mutex) { int err; + pthread_mutexattr_t mutexattr; - err = pthread_mutex_init(&mutex->lock, NULL); + mutex->owner = pthread_null; + pthread_mutexattr_init(&mutexattr); + pthread_mutexattr_settype(&mutexattr, PTHREAD_MUTEX_ERRORCHECK); + err = pthread_mutex_init(&mutex->lock, &mutexattr); + pthread_mutexattr_destroy(&mutexattr); if (err) error_exit(err, __func__); } @@ -48,13 +56,20 @@ void qemu_mutex_lock(QemuMutex *mutex) int err; err = pthread_mutex_lock(&mutex->lock); + 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) { + mutex->owner = pthread_self(); + } + + return !!err; } static void timespec_add_ms(struct timespec *ts, uint64_t msecs) @@ -85,6 +100,7 @@ void qemu_mutex_unlock(QemuMutex *mutex) { int err; + mutex->owner = pthread_null; err = pthread_mutex_unlock(&mutex->lock); if (err) error_exit(err, __func__); @@ -130,7 +146,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 {