From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Lmc0v-0001x6-0Q for qemu-devel@nongnu.org; Wed, 25 Mar 2009 18:56:01 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Lmc0q-0001po-4P for qemu-devel@nongnu.org; Wed, 25 Mar 2009 18:55:59 -0400 Received: from [199.232.76.173] (port=49782 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Lmc0p-0001pW-K7 for qemu-devel@nongnu.org; Wed, 25 Mar 2009 18:55:55 -0400 Received: from mx2.redhat.com ([66.187.237.31]:51067) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Lmc0p-0006H6-13 for qemu-devel@nongnu.org; Wed, 25 Mar 2009 18:55:55 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n2PMtsfO032352 for ; Wed, 25 Mar 2009 18:55:54 -0400 Message-Id: <20090325225438.835198466@amt.cnet> Date: Wed, 25 Mar 2009 19:47:16 -0300 From: Marcelo Tosatti References: <20090325224714.853788328@amt.cnet> Content-Disposition: inline; filename=iothread-mutex Subject: [Qemu-devel] [patch 02/10] qemu: mutex/thread/cond wrappers Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti Signed-off-by: Marcelo Tosatti Index: trunk/qemu-thread.c =================================================================== --- /dev/null +++ trunk/qemu-thread.c @@ -0,0 +1,123 @@ +#include +#include +#include +#include +#include +#include +#include "qemu-thread.h" + +static void error_exit(const char *msg) +{ + perror(msg); + exit(1); +} + +void qemu_mutex_init(QemuMutex *mutex) +{ + if (pthread_mutex_init(&mutex->lock, NULL)) + error_exit(__func__); +} + +void qemu_mutex_lock(QemuMutex *mutex) +{ + if (pthread_mutex_lock(&mutex->lock)) + error_exit(__func__); +} + +int qemu_mutex_trylock(QemuMutex *mutex) +{ + return pthread_mutex_trylock(&mutex->lock); +} + +static void timespec_add_ms(struct timespec *ts, uint64_t msecs) +{ + ts->tv_sec = ts->tv_sec + (long)(msecs / 1000); + ts->tv_nsec = (ts->tv_nsec + ((long)msecs % 1000) * 1000000); + if (ts->tv_nsec >= 1000000000) { + ts->tv_nsec -= 1000000000; + ts->tv_sec++; + } +} + +int qemu_mutex_timedlock(QemuMutex *mutex, uint64_t msecs) +{ + int r; + struct timespec ts; + + clock_gettime(CLOCK_REALTIME, &ts); + timespec_add_ms(&ts, msecs); + + r = pthread_mutex_timedlock(&mutex->lock, &ts); + if (r && r != ETIMEDOUT) + error_exit(__func__); + return r; +} + +void qemu_mutex_unlock(QemuMutex *mutex) +{ + if (pthread_mutex_unlock(&mutex->lock)) + error_exit(__func__); +} + +void qemu_cond_init(QemuCond *cond) +{ + if (pthread_cond_init(&cond->cond, NULL)) + error_exit(__func__); +} + +void qemu_cond_signal(QemuCond *cond) +{ + if (pthread_cond_signal(&cond->cond)) + error_exit(__func__); +} + +void qemu_cond_broadcast(QemuCond *cond) +{ + if (pthread_cond_broadcast(&cond->cond)) + error_exit(__func__); +} + +void qemu_cond_wait(QemuCond *cond, QemuMutex *mutex) +{ + if (pthread_cond_wait(&cond->cond, &mutex->lock)) + error_exit(__func__); +} + +int qemu_cond_timedwait(QemuCond *cond, QemuMutex *mutex, uint64_t msecs) +{ + struct timespec ts; + int r; + + clock_gettime(CLOCK_REALTIME, &ts); + timespec_add_ms(&ts, msecs); + + r = pthread_cond_timedwait(&cond->cond, &mutex->lock, &ts); + if (r && r != ETIMEDOUT) + error_exit(__func__); + return r; +} + +void qemu_thread_create(QemuThread *thread, + void *(*start_routine)(void*), + void *arg) +{ + if (pthread_create(&thread->thread, NULL, start_routine, arg)) + error_exit(__func__); +} + +void qemu_thread_signal(QemuThread *thread, int sig) +{ + if (pthread_kill(thread->thread, sig)) + error_exit(__func__); +} + +void qemu_thread_self(QemuThread *thread) +{ + thread->thread = pthread_self(); +} + +int qemu_thread_equal(QemuThread *thread1, QemuThread *thread2) +{ + return (thread1->thread == thread2->thread); +} + Index: trunk/qemu-thread.h =================================================================== --- /dev/null +++ trunk/qemu-thread.h @@ -0,0 +1,40 @@ +#ifndef __QEMU_THREAD_H +#define __QEMU_THREAD_H 1 +#include "semaphore.h" +#include "pthread.h" + +struct QemuMutex { + pthread_mutex_t lock; +}; + +struct QemuCond { + pthread_cond_t cond; +}; + +struct QemuThread { + pthread_t thread; +}; + +typedef struct QemuMutex QemuMutex; +typedef struct QemuCond QemuCond; +typedef struct QemuThread QemuThread; + +void qemu_mutex_init(QemuMutex *mutex); +void qemu_mutex_lock(QemuMutex *mutex); +int qemu_mutex_trylock(QemuMutex *mutex); +int qemu_mutex_timedlock(QemuMutex *mutex, uint64_t msecs); +void qemu_mutex_unlock(QemuMutex *mutex); + +void qemu_cond_init(QemuCond *cond); +void qemu_cond_signal(QemuCond *cond); +void qemu_cond_broadcast(QemuCond *cond); +void qemu_cond_wait(QemuCond *cond, QemuMutex *mutex); +int qemu_cond_timedwait(QemuCond *cond, QemuMutex *mutex, uint64_t msecs); + +void qemu_thread_create(QemuThread *thread, + void *(*start_routine)(void*), + void *arg); +void qemu_thread_signal(QemuThread *thread, int sig); +void qemu_thread_self(QemuThread *thread); +int qemu_thread_equal(QemuThread *thread1, QemuThread *thread2); +#endif Index: trunk/Makefile.target =================================================================== --- trunk.orig/Makefile.target +++ trunk/Makefile.target @@ -501,6 +501,7 @@ endif #CONFIG_BSD_USER ifndef CONFIG_USER_ONLY OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o dma-helpers.o +OBJS+=qemu-thread.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly OBJS+=virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o