From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: eesposit@redhat.com, vsementsov@virtuozzo.com,
stefanha@redhat.com, qemu-block@nongnu.org
Subject: [PATCH v2 2/6] coroutine-sleep: disallow NULL QemuCoSleepState** argument
Date: Mon, 17 May 2021 12:05:44 +0200 [thread overview]
Message-ID: <20210517100548.28806-3-pbonzini@redhat.com> (raw)
In-Reply-To: <20210517100548.28806-1-pbonzini@redhat.com>
Simplify the code by removing conditionals. qemu_co_sleep_ns
can simply point the argument to an on-stack temporary.
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
include/qemu/coroutine.h | 5 +++--
util/qemu-coroutine-sleep.c | 18 +++++-------------
2 files changed, 8 insertions(+), 15 deletions(-)
diff --git a/include/qemu/coroutine.h b/include/qemu/coroutine.h
index ce5b9c6851..c5d7742989 100644
--- a/include/qemu/coroutine.h
+++ b/include/qemu/coroutine.h
@@ -295,7 +295,7 @@ typedef struct QemuCoSleepState QemuCoSleepState;
/**
* Yield the coroutine for a given duration. During this yield, @sleep_state
- * (if not NULL) is set to an opaque pointer, which may be used for
+ * is set to an opaque pointer, which may be used for
* qemu_co_sleep_wake(). Be careful, the pointer is set back to zero when the
* timer fires. Don't save the obtained value to other variables and don't call
* qemu_co_sleep_wake from another aio context.
@@ -304,7 +304,8 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
QemuCoSleepState **sleep_state);
static inline void coroutine_fn qemu_co_sleep_ns(QEMUClockType type, int64_t ns)
{
- qemu_co_sleep_ns_wakeable(type, ns, NULL);
+ QemuCoSleepState *unused = NULL;
+ qemu_co_sleep_ns_wakeable(type, ns, &unused);
}
/**
diff --git a/util/qemu-coroutine-sleep.c b/util/qemu-coroutine-sleep.c
index eec6e81f3f..3f6f637e81 100644
--- a/util/qemu-coroutine-sleep.c
+++ b/util/qemu-coroutine-sleep.c
@@ -32,9 +32,7 @@ void qemu_co_sleep_wake(QemuCoSleepState *sleep_state)
qemu_co_sleep_ns__scheduled, NULL);
assert(scheduled == qemu_co_sleep_ns__scheduled);
- if (sleep_state->user_state_pointer) {
- *sleep_state->user_state_pointer = NULL;
- }
+ *sleep_state->user_state_pointer = NULL;
timer_del(&sleep_state->ts);
aio_co_wake(sleep_state->co);
}
@@ -63,16 +61,10 @@ void coroutine_fn qemu_co_sleep_ns_wakeable(QEMUClockType type, int64_t ns,
}
aio_timer_init(ctx, &state.ts, type, SCALE_NS, co_sleep_cb, &state);
- if (sleep_state) {
- *sleep_state = &state;
- }
+ *sleep_state = &state;
timer_mod(&state.ts, qemu_clock_get_ns(type) + ns);
qemu_coroutine_yield();
- if (sleep_state) {
- /*
- * Note that *sleep_state is cleared during qemu_co_sleep_wake
- * before resuming this coroutine.
- */
- assert(*sleep_state == NULL);
- }
+
+ /* qemu_co_sleep_wake clears *sleep_state before resuming this coroutine. */
+ assert(*sleep_state == NULL);
}
--
2.31.1
next prev parent reply other threads:[~2021-05-17 10:07 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-17 10:05 [PATCH v2 0/6] coroutine: new sleep/wake API Paolo Bonzini
2021-05-17 10:05 ` [PATCH v2 1/6] coroutine-sleep: use a stack-allocated timer Paolo Bonzini
2021-05-17 10:05 ` Paolo Bonzini [this message]
2021-05-17 10:05 ` [PATCH v2 3/6] coroutine-sleep: allow qemu_co_sleep_wake that wakes nothing Paolo Bonzini
2021-05-17 10:05 ` [PATCH v2 4/6] coroutine-sleep: move timer out of QemuCoSleepState Paolo Bonzini
2021-05-17 10:05 ` [PATCH v2 5/6] coroutine-sleep: replace QemuCoSleepState pointer with struct in the API Paolo Bonzini
2021-05-17 10:05 ` [PATCH v2 6/6] coroutine-sleep: introduce qemu_co_sleep Paolo Bonzini
2021-05-21 14:44 ` [PATCH v2 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=20210517100548.28806-3-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=eesposit@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@virtuozzo.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).