ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coroutine: Extract qemu_aio_coroutine_enter 

It's a variant of qemu_coroutine_enter with an explicit AioContext
parameter.

Signed-off-by: Fam Zheng <famz@redhat.com>
Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Fam Zheng 2017-04-10 20:06:12 +08:00
parent d90fce9446
commit ba9e75ceef
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/qemu/coroutine.h
View File

@ -76,6 +76,11 @@ void qemu_coroutine_enter(Coroutine *coroutine);
*/ */
void qemu_coroutine_enter_if_inactive(Coroutine *co); void qemu_coroutine_enter_if_inactive(Coroutine *co);
/**
* Transfer control to a coroutine and associate it with ctx
*/
void qemu_aio_coroutine_enter(AioContext *ctx, Coroutine *co);
/** /**
* Transfer control back to a coroutine's caller * Transfer control back to a coroutine's caller
* *

11
util/qemu-coroutine.c
View File

@ -102,12 +102,12 @@ static void coroutine_delete(Coroutine *co)
qemu_coroutine_delete(co); qemu_coroutine_delete(co);
} }
void qemu_coroutine_enter(Coroutine *co) void qemu_aio_coroutine_enter(AioContext *ctx, Coroutine *co)
{ {
Coroutine *self = qemu_coroutine_self(); Coroutine *self = qemu_coroutine_self();
CoroutineAction ret; CoroutineAction ret;
trace_qemu_coroutine_enter(self, co, co->entry_arg); trace_qemu_aio_coroutine_enter(ctx, self, co, co->entry_arg);
if (co->caller) { if (co->caller) {
fprintf(stderr, "Co-routine re-entered recursively\n"); fprintf(stderr, "Co-routine re-entered recursively\n");
@ -115,7 +115,7 @@ void qemu_coroutine_enter(Coroutine *co)
} }
co->caller = self; co->caller = self;
co->ctx = qemu_get_current_aio_context(); co->ctx = ctx;
/* Store co->ctx before anything that stores co. Matches /* Store co->ctx before anything that stores co. Matches
* barrier in aio_co_wake and qemu_co_mutex_wake. * barrier in aio_co_wake and qemu_co_mutex_wake.
@ -139,6 +139,11 @@ void qemu_coroutine_enter(Coroutine *co)
} }
} }
void qemu_coroutine_enter(Coroutine *co)
{
qemu_aio_coroutine_enter(qemu_get_current_aio_context(), co);
}
void qemu_coroutine_enter_if_inactive(Coroutine *co) void qemu_coroutine_enter_if_inactive(Coroutine *co)
{ {
if (!qemu_coroutine_entered(co)) { if (!qemu_coroutine_entered(co)) {

2
util/trace-events
View File

@ -22,7 +22,7 @@ buffer_move(const char *buf, size_t len, const char *from) "%s: %zd bytes from %
buffer_free(const char *buf, size_t len) "%s: capacity %zd" buffer_free(const char *buf, size_t len) "%s: capacity %zd"
# util/qemu-coroutine.c # util/qemu-coroutine.c
qemu_coroutine_enter(void *from, void *to, void *opaque) "from %p to %p opaque %p" qemu_aio_coroutine_enter(void *ctx, void *from, void *to, void *opaque) "ctx %p from %p to %p opaque %p"
qemu_coroutine_yield(void *from, void *to) "from %p to %p" qemu_coroutine_yield(void *from, void *to) "from %p to %p"
qemu_coroutine_terminate(void *co) "self %p" qemu_coroutine_terminate(void *co) "self %p"