0b8b8753e4
In practice the entry argument is always known at creation time, and it is confusing that sometimes qemu_coroutine_enter is used with a non-NULL argument to re-enter a coroutine (this happens in block/sheepdog.c and tests/test-coroutine.c). So pass the opaque value at creation time, for consistency with e.g. aio_bh_new. Mostly done with the following semantic patch: @ entry1 @ expression entry, arg, co; @@ - co = qemu_coroutine_create(entry); + co = qemu_coroutine_create(entry, arg); ... - qemu_coroutine_enter(co, arg); + qemu_coroutine_enter(co); @ entry2 @ expression entry, arg; identifier co; @@ - Coroutine *co = qemu_coroutine_create(entry); + Coroutine *co = qemu_coroutine_create(entry, arg); ... - qemu_coroutine_enter(co, arg); + qemu_coroutine_enter(co); @ entry3 @ expression entry, arg; @@ - qemu_coroutine_enter(qemu_coroutine_create(entry), arg); + qemu_coroutine_enter(qemu_coroutine_create(entry, arg)); @ reentry @ expression co; @@ - qemu_coroutine_enter(co, NULL); + qemu_coroutine_enter(co); except for the aforementioned few places where the semantic patch stumbled (as expected) and for test_co_queue, which would otherwise produce an uninitialized variable warning. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Fam Zheng <famz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
43 lines
982 B
C
43 lines
982 B
C
/*
|
|
* QEMU coroutine sleep
|
|
*
|
|
* Copyright IBM, Corp. 2011
|
|
*
|
|
* Authors:
|
|
* Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU LGPL, version 2 or later.
|
|
* See the COPYING.LIB file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "qemu/coroutine.h"
|
|
#include "qemu/timer.h"
|
|
#include "block/aio.h"
|
|
|
|
typedef struct CoSleepCB {
|
|
QEMUTimer *ts;
|
|
Coroutine *co;
|
|
} CoSleepCB;
|
|
|
|
static void co_sleep_cb(void *opaque)
|
|
{
|
|
CoSleepCB *sleep_cb = opaque;
|
|
|
|
qemu_coroutine_enter(sleep_cb->co);
|
|
}
|
|
|
|
void coroutine_fn co_aio_sleep_ns(AioContext *ctx, QEMUClockType type,
|
|
int64_t ns)
|
|
{
|
|
CoSleepCB sleep_cb = {
|
|
.co = qemu_coroutine_self(),
|
|
};
|
|
sleep_cb.ts = aio_timer_new(ctx, type, SCALE_NS, co_sleep_cb, &sleep_cb);
|
|
timer_mod(sleep_cb.ts, qemu_clock_get_ns(type) + ns);
|
|
qemu_coroutine_yield();
|
|
timer_del(sleep_cb.ts);
|
|
timer_free(sleep_cb.ts);
|
|
}
|