From patchwork Fri Nov 2 13:14:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 196557 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8618C2C00C2 for ; Sat, 3 Nov 2012 00:14:42 +1100 (EST) Received: from localhost ([::1]:53849 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUH56-0003Tt-DZ for incoming@patchwork.ozlabs.org; Fri, 02 Nov 2012 09:14:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:49760) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUH4k-0003Jb-1H for qemu-devel@nongnu.org; Fri, 02 Nov 2012 09:14:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TUH4i-0007ok-5B for qemu-devel@nongnu.org; Fri, 02 Nov 2012 09:14:17 -0400 Received: from mail-ee0-f45.google.com ([74.125.83.45]:52990) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TUH4h-0007oQ-Vn for qemu-devel@nongnu.org; Fri, 02 Nov 2012 09:14:16 -0400 Received: by mail-ee0-f45.google.com with SMTP id b47so1887248eek.4 for ; Fri, 02 Nov 2012 06:14:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=v4pdOm3NXjODH57HBXpfbjTRiM02JiaG9qQO55WXRq4=; b=zFmr199YPXqNvPhhmWaZHGE/h2iDfoOGl7/khmMnYeCKC9eQEX5AVaakgDGOhuP7a9 2uIelN1qaAcx/XnIRGGsjNyWHUHiks4R7PPansch4mW9JC21H7OCEfQH11pV2YdYp+nU 4wN5aeokR89QFCG87PQmCODW7l2ble2yTdmoUwWJoqCrrPzdNbCnkroQ0XqO+B+Ff5+n lUHSfiLTfCL2VU2P6Tgg01tBwUIwCFXSkGltGjDr0+N8JBCbDaJVUEVYWWrhKQTabT8w uSQUTO7PZ2d6kUcqavkOaGolL/56DNnccagb9K9l1LkiaG4ufoocwablkdJyvJw5ubOk YjSQ== Received: by 10.14.193.134 with SMTP id k6mr6648117een.15.1351862055704; Fri, 02 Nov 2012 06:14:15 -0700 (PDT) Received: from yakj.lan (93-34-169-1.ip50.fastwebnet.it. [93.34.169.1]) by mx.google.com with ESMTPS id o47sm22953076eem.11.2012.11.02.06.14.14 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 02 Nov 2012 06:14:15 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 2 Nov 2012 14:14:04 +0100 Message-Id: <1351862047-23172-3-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.7.12.1 In-Reply-To: <1351862047-23172-1-git-send-email-pbonzini@redhat.com> References: <1351862047-23172-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 74.125.83.45 Cc: blauwirbel@gmail.com, jan.kiszka@siemens.com, peter.maydell@linaro.org Subject: [Qemu-devel] [PATCH 2/5] semaphore: implement fallback counting semaphores with mutex+condvar X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org OpenBSD and Darwin do not have sem_timedwait. Implement a fallback for them. Signed-off-by: Paolo Bonzini --- qemu-thread-posix.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++ qemu-thread-posix.h | 6 +++++ 2 file modificati, 80 inserzioni(+) diff --git a/qemu-thread-posix.c b/qemu-thread-posix.c index 6a3d3a1..048db8f 100644 --- a/qemu-thread-posix.c +++ b/qemu-thread-posix.c @@ -122,36 +122,100 @@ void qemu_sem_init(QemuSemaphore *sem, int init) { int rc; +#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) + rc = pthread_mutex_init(&sem->lock, NULL); + if (rc != 0) { + error_exit(rc, __func__); + } + rc = pthread_cond_init(&sem->cond, NULL); + if (rc != 0) { + error_exit(rc, __func__); + } + if (init < 0) { + error_exit(EINVAL, __func__); + } + sem->count = init; +#else rc = sem_init(&sem->sem, 0, init); if (rc < 0) { error_exit(errno, __func__); } +#endif } void qemu_sem_destroy(QemuSemaphore *sem) { int rc; +#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) + rc = pthread_cond_destroy(&sem->cond); + if (rc < 0) { + error_exit(rc, __func__); + } + rc = pthread_mutex_destroy(&sem->lock); + if (rc < 0) { + error_exit(rc, __func__); + } +#else rc = sem_destroy(&sem->sem); if (rc < 0) { error_exit(errno, __func__); } +#endif } void qemu_sem_post(QemuSemaphore *sem) { int rc; +#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) + pthread_mutex_lock(&sem->lock); + if (sem->count == INT_MAX) { + rc = EINVAL; + } else if (sem->count++ < 0) { + rc = pthread_cond_signal(&sem->cond); + } else { + rc = 0; + } + pthread_mutex_unlock(&sem->lock); + if (rc != 0) { + error_exit(rc, __func__); + } +#else rc = sem_post(&sem->sem); if (rc < 0) { error_exit(errno, __func__); } +#endif } int qemu_sem_timedwait(QemuSemaphore *sem, int ms) { int rc; +#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) + struct timespec ts; + clock_gettime(CLOCK_REALTIME, &ts); + if (ms) { + int nsec = ts.tv_nsec + (ms % 1000) * 1000000; + ts.tv_sec += ms / 1000 + nsec / 1000000000; + ts.tv_nsec = nsec % 1000000000; + } + + pthread_mutex_lock(&sem->lock); + --sem->count; + while (sem->count < 0) { + rc = pthread_cond_timedwait(&sem->cond, &sem->lock, &ts); + if (rc == ETIMEDOUT) { + break; + } + if (rc != 0) { + error_exit(rc, __func__); + } + } + pthread_mutex_unlock(&sem->lock); + return (rc == ETIMEDOUT ? -1 : 0); +#else if (ms <= 0) { /* This is cheaper than sem_timedwait. */ do { @@ -181,10 +245,19 @@ int qemu_sem_timedwait(QemuSemaphore *sem, int ms) error_exit(errno, __func__); } return 0; +#endif } void qemu_sem_wait(QemuSemaphore *sem) { +#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) + pthread_mutex_lock(&sem->lock); + --sem->count; + while (sem->count < 0) { + pthread_cond_wait(&sem->cond, &sem->lock); + } + pthread_mutex_unlock(&sem->lock); +#else int rc; do { @@ -193,6 +266,7 @@ void qemu_sem_wait(QemuSemaphore *sem) if (rc < 0) { error_exit(errno, __func__); } +#endif } void qemu_thread_create(QemuThread *thread, diff --git a/qemu-thread-posix.h b/qemu-thread-posix.h index 2542c15..1c098c2 100644 --- a/qemu-thread-posix.h +++ b/qemu-thread-posix.h @@ -12,7 +12,13 @@ struct QemuCond { }; struct QemuSemaphore { +#if defined(__OpenBSD__) || defined(__APPLE__) || defined(__NetBSD__) + pthread_mutex_t lock; + pthread_cond_t cond; + int count; +#else sem_t sem; +#endif }; struct QemuThread {