haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

w32: Initialise critical section before starting thread (fix #922131)

Browse source 
This patch was contributed by Bogdan Harjoc. I added some assertions.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2012-01-31 07:14:15 +01:00
parent 0fa5491eed
commit edc1de9713
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
qemu-thread-win32.c
View file

@ -215,8 +215,6 @@ static unsigned __stdcall win32_start_routine(void *arg)
if (data->mode == QEMU_THREAD_DETACHED) { if (data->mode == QEMU_THREAD_DETACHED) {
g_free(data); g_free(data);
data = NULL; data = NULL;
} else {
InitializeCriticalSection(&data->cs);
} }
TlsSetValue(qemu_thread_tls_index, data); TlsSetValue(qemu_thread_tls_index, data);
qemu_thread_exit(start_routine(thread_arg)); qemu_thread_exit(start_routine(thread_arg));
@ -227,6 +225,7 @@ void qemu_thread_exit(void *arg)
{ {
QemuThreadData *data = TlsGetValue(qemu_thread_tls_index); QemuThreadData *data = TlsGetValue(qemu_thread_tls_index);
if (data) { if (data) {
assert(data->mode != QEMU_THREAD_DETACHED);
data->ret = arg; data->ret = arg;
EnterCriticalSection(&data->cs); EnterCriticalSection(&data->cs);
data->exited = true; data->exited = true;
@ -258,6 +257,7 @@ void *qemu_thread_join(QemuThread *thread)
CloseHandle(handle); CloseHandle(handle);
} }
ret = data->ret; ret = data->ret;
assert(data->mode != QEMU_THREAD_DETACHED);
DeleteCriticalSection(&data->cs); DeleteCriticalSection(&data->cs);
g_free(data); g_free(data);
return ret; return ret;
@ -288,6 +288,10 @@ void qemu_thread_create(QemuThread *thread,
data->mode = mode; data->mode = mode;
data->exited = false; data->exited = false;
if (data->mode != QEMU_THREAD_DETACHED) {
InitializeCriticalSection(&data->cs);
}
hThread = (HANDLE) _beginthreadex(NULL, 0, win32_start_routine, hThread = (HANDLE) _beginthreadex(NULL, 0, win32_start_routine,
data, 0, &thread->tid); data, 0, &thread->tid);
if (!hThread) { if (!hThread) {
@ -314,6 +318,7 @@ HANDLE qemu_thread_get_handle(QemuThread *thread)
return NULL; return NULL;
} }
assert(data->mode != QEMU_THREAD_DETACHED);
EnterCriticalSection(&data->cs); EnterCriticalSection(&data->cs);
if (!data->exited) { if (!data->exited) {
handle = OpenThread(SYNCHRONIZE | THREAD_SUSPEND_RESUME, FALSE, handle = OpenThread(SYNCHRONIZE | THREAD_SUSPEND_RESUME, FALSE,