[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/8] coroutine-sleep: move timer out of QemuCoSleepState
From: |
Stefan Hajnoczi |
Subject: |
[PULL 6/8] coroutine-sleep: move timer out of QemuCoSleepState |
Date: |
Mon, 24 May 2021 14:01:48 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
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>
---
util/qemu-coroutine-sleep.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index 3ae2b5399a..1d25019620 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -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);
--
2.31.1
- [PULL 0/8] Block patches, Stefan Hajnoczi, 2021/05/24
- [PULL 1/8] multi-process: Initialize variables declared with g_auto*, Stefan Hajnoczi, 2021/05/24
- [PULL 3/8] coroutine-sleep: use a stack-allocated timer, Stefan Hajnoczi, 2021/05/24
- [PULL 4/8] coroutine-sleep: disallow NULL QemuCoSleepState** argument, Stefan Hajnoczi, 2021/05/24
- [PULL 2/8] bitops.h: Improve find_xxx_bit() documentation, Stefan Hajnoczi, 2021/05/24
- [PULL 5/8] coroutine-sleep: allow qemu_co_sleep_wake that wakes nothing, Stefan Hajnoczi, 2021/05/24
- [PULL 6/8] coroutine-sleep: move timer out of QemuCoSleepState,
Stefan Hajnoczi <=
- [PULL 7/8] coroutine-sleep: replace QemuCoSleepState pointer with struct in the API, Stefan Hajnoczi, 2021/05/24
- [PULL 8/8] coroutine-sleep: introduce qemu_co_sleep, Stefan Hajnoczi, 2021/05/24
- Re: [PULL 0/8] Block patches, Peter Maydell, 2021/05/24