vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

coroutine-sleep: use a stack-allocated timer 

The lifetime of the timer is well-known (it cannot outlive
qemu_co_sleep_ns_wakeable, because it's deleted by the time the
coroutine resumes), so it is not necessary to place it on the heap.

Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20210517100548.28806-2-pbonzini@redhat.com
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
master
Paolo Bonzini 2021-05-17 12:05:43 +02:00 committed by Stefan Hajnoczi
parent 5c6ae58d4b
commit 5b33e015d3
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/qemu-coroutine-sleep.c
View File

@ -21,7 +21,7 @@ static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
struct QemuCoSleepState { struct QemuCoSleepState {
Coroutine *co; Coroutine *co;
QEMUTimer *ts; QEMUTimer ts;
QemuCoSleepState **user_state_pointer; QemuCoSleepState **user_state_pointer;
}; };
@ -35,7 +35,7 @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
if (sleep_state->user_state_pointer) { if (sleep_state->user_state_pointer) {
*sleep_state->user_state_pointer = NULL; *sleep_state->user_state_pointer = NULL;
} }
timer_del(sleep_state->ts); timer_del(&sleep_state->ts);
aio_co_wake(sleep_state->co); aio_co_wake(sleep_state->co);
} }
@ -50,7 +50,6 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
AioContext *ctx = qemu_get_current_aio_context(); AioContext *ctx = qemu_get_current_aio_context();
QemuCoSleepState state = { QemuCoSleepState state = {
.co = qemu_coroutine_self(), .co = qemu_coroutine_self(),
.ts = aio_timer_new(ctx, type, SCALE_NS, co_sleep_cb, &state),
.user_state_pointer = sleep_state, .user_state_pointer = sleep_state,
}; };
@ -63,10 +62,11 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
abort(); abort();
} }
aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, &state);
if (sleep_state) { if (sleep_state) {
*sleep_state = &state; *sleep_state = &state;
} }
timer_mod(state.ts, qemu_clock_get_ns(type) + ns); timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
qemu_coroutine_yield(); qemu_coroutine_yield();
if (sleep_state) { if (sleep_state) {
/* /*
@ -75,5 +75,4 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
*/ */
assert(*sleep_state == NULL); assert(*sleep_state == NULL);
} }
timer_free(state.ts);
} }