coroutine-sleep: move timer out of QemuCoSleepState
This simplification is enabled by the previous patch. Now aio_co_wake will only be called once, therefore we do not care about a spurious firing of the timer after a qemu_co_sleep_wake. Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Message-id: 20210517100548.28806-5-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
eaee072085
commit
1485f0c24c
@ -21,7 +21,6 @@ static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
|
||||
|
||||
struct QemuCoSleepState {
|
||||
Coroutine *co;
|
||||
QEMUTimer ts;
|
||||
QemuCoSleepState **user_state_pointer;
|
||||
};
|
||||
|
||||
@ -34,7 +33,6 @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
|
||||
|
||||
assert(scheduled == qemu_co_sleep_ns__scheduled);
|
||||
*sleep_state->user_state_pointer = NULL;
|
||||
timer_del(&sleep_state->ts);
|
||||
aio_co_wake(sleep_state->co);
|
||||
}
|
||||
}
|
||||
@ -49,6 +47,7 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
|
||||
QemuCoSleepState **sleep_state)
|
||||
{
|
||||
AioContext *ctx = qemu_get_current_aio_context();
|
||||
QEMUTimer ts;
|
||||
QemuCoSleepState state = {
|
||||
.co = qemu_coroutine_self(),
|
||||
.user_state_pointer = sleep_state,
|
||||
@ -63,10 +62,11 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
|
||||
abort();
|
||||
}
|
||||
|
||||
aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, sleep_state);
|
||||
aio_timer_init(ctx, &ts, type, SCALE_NS, co_sleep_cb, sleep_state);
|
||||
*sleep_state = &state;
|
||||
timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
|
||||
timer_mod(&ts, qemu_clock_get_ns(type) + ns);
|
||||
qemu_coroutine_yield();
|
||||
timer_del(&ts);
|
||||
|
||||
/* qemu_co_sleep_wake clears *sleep_state before resuming this coroutine. */
|
||||
assert(*sleep_state == NULL);
|
||||
|
Loading…
Reference in New Issue
Block a user