OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

coroutine: Let CoMutex remember who holds it

Browse Source 
In cases of deadlocks, knowing who holds a given CoMutex is really
helpful for debugging. Keeping the information around doesn't cost much
and allows us to add another assertion to keep the code correct, so
let's just add it.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Kevin Wolf 2016-08-11 17:45:06 +02:00
parent 8b2bd09338
commit 0e438cdc93
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/qemu/coroutine.h
View File

@ -143,6 +143,7 @@ bool qemu_co_queue_empty(CoQueue *queue);
*/ */
typedef struct CoMutex { typedef struct CoMutex {
bool locked; bool locked;
Coroutine *holder;
CoQueue queue; CoQueue queue;
} CoMutex; } CoMutex;

3
util/qemu-coroutine-lock.c
View File

@ -129,6 +129,7 @@ void coroutine_fn qemu_co_mutex_lock(CoMutex *mutex)
} }
mutex->locked = true; mutex->locked = true;
mutex->holder = self;
trace_qemu_co_mutex_lock_return(mutex, self); trace_qemu_co_mutex_lock_return(mutex, self);
} }
@ -140,9 +141,11 @@ void coroutine_fn qemu_co_mutex_unlock(CoMutex *mutex)
trace_qemu_co_mutex_unlock_entry(mutex, self); trace_qemu_co_mutex_unlock_entry(mutex, self);
assert(mutex->locked == true); assert(mutex->locked == true);
assert(mutex->holder == self);
assert(qemu_in_coroutine()); assert(qemu_in_coroutine());
mutex->locked = false; mutex->locked = false;
mutex->holder = NULL;
qemu_co_queue_next(&mutex->queue); qemu_co_queue_next(&mutex->queue);
trace_qemu_co_mutex_unlock_return(mutex, self); trace_qemu_co_mutex_unlock_return(mutex, self);