mirror of
https://github.com/mii443/qemu.git
synced 2025-12-16 17:18:49 +00:00
qemu-thread: introduce qemu-thread-common.h
Introduce some hooks for the shared part of qemu thread between POSIX and Windows implementations. Note that in qemu_mutex_unlock_impl() we moved the call before unlock operation which should make more sense. And we don't need qemu_mutex_post_unlock() hook. Put all these shared hooks into the header files. It should be internal to qemu-thread but not for qemu-thread users, hence put into util/ directory. Reviewed-by: Emilio G. Cota <cota@braap.org> Signed-off-by: Peter Xu <peterx@redhat.com> Message-Id: <20180425025459.5258-3-peterx@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
#include "qemu-common.h"
|
||||
#include "qemu/thread.h"
|
||||
#include "qemu/notify.h"
|
||||
#include "trace.h"
|
||||
#include "qemu-thread-common.h"
|
||||
#include <process.h>
|
||||
|
||||
static bool name_threads;
|
||||
@@ -46,7 +46,7 @@ static void error_exit(int err, const char *msg)
|
||||
void qemu_mutex_init(QemuMutex *mutex)
|
||||
{
|
||||
InitializeSRWLock(&mutex->lock);
|
||||
mutex->initialized = true;
|
||||
qemu_mutex_post_init(mutex);
|
||||
}
|
||||
|
||||
void qemu_mutex_destroy(QemuMutex *mutex)
|
||||
@@ -59,10 +59,9 @@ void qemu_mutex_destroy(QemuMutex *mutex)
|
||||
void qemu_mutex_lock_impl(QemuMutex *mutex, const char *file, const int line)
|
||||
{
|
||||
assert(mutex->initialized);
|
||||
trace_qemu_mutex_lock(mutex, file, line);
|
||||
|
||||
qemu_mutex_pre_lock(mutex, file, line);
|
||||
AcquireSRWLockExclusive(&mutex->lock);
|
||||
trace_qemu_mutex_locked(mutex, file, line);
|
||||
qemu_mutex_post_lock(mutex, file, line);
|
||||
}
|
||||
|
||||
int qemu_mutex_trylock_impl(QemuMutex *mutex, const char *file, const int line)
|
||||
@@ -72,7 +71,7 @@ int qemu_mutex_trylock_impl(QemuMutex *mutex, const char *file, const int line)
|
||||
assert(mutex->initialized);
|
||||
owned = TryAcquireSRWLockExclusive(&mutex->lock);
|
||||
if (owned) {
|
||||
trace_qemu_mutex_locked(mutex, file, line);
|
||||
qemu_mutex_post_lock(mutex, file, line);
|
||||
return 0;
|
||||
}
|
||||
return -EBUSY;
|
||||
@@ -81,7 +80,7 @@ int qemu_mutex_trylock_impl(QemuMutex *mutex, const char *file, const int line)
|
||||
void qemu_mutex_unlock_impl(QemuMutex *mutex, const char *file, const int line)
|
||||
{
|
||||
assert(mutex->initialized);
|
||||
trace_qemu_mutex_unlock(mutex, file, line);
|
||||
qemu_mutex_pre_unlock(mutex, file, line);
|
||||
ReleaseSRWLockExclusive(&mutex->lock);
|
||||
}
|
||||
|
||||
@@ -145,9 +144,9 @@ void qemu_cond_broadcast(QemuCond *cond)
|
||||
void qemu_cond_wait_impl(QemuCond *cond, QemuMutex *mutex, const char *file, const int line)
|
||||
{
|
||||
assert(cond->initialized);
|
||||
trace_qemu_mutex_unlock(mutex, file, line);
|
||||
qemu_mutex_pre_unlock(mutex, file, line);
|
||||
SleepConditionVariableSRW(&cond->var, &mutex->lock, INFINITE, 0);
|
||||
trace_qemu_mutex_locked(mutex, file, line);
|
||||
qemu_mutex_post_lock(mutex, file, line);
|
||||
}
|
||||
|
||||
void qemu_sem_init(QemuSemaphore *sem, int init)
|
||||
|
||||
Reference in New Issue
Block a user