From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: eesposit@redhat.com, stefanha@redhat.com
Subject: [PATCH 1/6] coroutine-sleep: use a stack-allocated timer
Date: Mon, 3 May 2021 13:25:45 +0200 [thread overview]
Message-ID: <20210503112550.478521-2-pbonzini@redhat.com> (raw)
In-Reply-To: <20210503112550.478521-1-pbonzini@redhat.com>
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.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
util/qemu-coroutine-sleep.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index 8c4dac4fd7..eec6e81f3f 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -21,7 +21,7 @@ static const char *qemu_co_sleep_ns__scheduled = "qemu_co_sleep_ns";
struct QemuCoSleepState {
Coroutine *co;
- QEMUTimer *ts;
+ QEMUTimer ts;
QemuCoSleepState **user_state_pointer;
};
@@ -35,7 +35,7 @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
if (sleep_state->user_state_pointer) {
*sleep_state->user_state_pointer = NULL;
}
- timer_del(sleep_state->ts);
+ timer_del(&sleep_state->ts);
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();
QemuCoSleepState state = {
.co = qemu_coroutine_self(),
- .ts = aio_timer_new(ctx, type, SCALE_NS, co_sleep_cb, &state),
.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, &state);
if (sleep_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();
if (sleep_state) {
/*
@@ -75,5 +75,4 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
*/
assert(*sleep_state == NULL);
}
- timer_free(state.ts);
}
--
2.31.1
next prev parent reply other threads:[~2021-05-03 11:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 11:25 [PATCH 0/6] coroutine: new sleep/wake API Paolo Bonzini
2021-05-03 11:25 ` Paolo Bonzini [this message]
2021-05-10 10:00 ` [PATCH 1/6] coroutine-sleep: use a stack-allocated timer Vladimir Sementsov-Ogievskiy
2021-05-03 11:25 ` [PATCH 2/6] coroutine-sleep: disallow NULL QemuCoSleepState** argument Paolo Bonzini
2021-05-10 10:03 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:25 ` [PATCH 3/6] coroutine-sleep: allow qemu_co_sleep_wake that wakes nothing Paolo Bonzini
2021-05-10 10:15 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:25 ` [PATCH 4/6] coroutine-sleep: move timer out of QemuCoSleepState Paolo Bonzini
2021-05-10 10:19 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:25 ` [PATCH 5/6] coroutine-sleep: replace QemuCoSleepState pointer with struct in the API Paolo Bonzini
2021-05-10 10:38 ` Vladimir Sementsov-Ogievskiy
2021-05-03 11:25 ` [PATCH 6/6] coroutine-sleep: introduce qemu_co_sleep Paolo Bonzini
2021-05-10 10:46 ` Vladimir Sementsov-Ogievskiy
2021-05-11 14:07 ` [PATCH 0/6] coroutine: new sleep/wake API Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210503112550.478521-2-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=eesposit@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).