[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv13 13/31] aio / timers: aio_ctx_prepare sets timeout
From: |
Alex Bligh |
Subject: |
[Qemu-devel] [PATCHv13 13/31] aio / timers: aio_ctx_prepare sets timeout from AioContext timers |
Date: |
Wed, 21 Aug 2013 16:02:51 +0100 |
Calculate the timeout in aio_ctx_prepare taking into account
the timers attached to the AioContext.
Alter aio_ctx_check similarly.
Signed-off-by: Alex Bligh <address@hidden>
---
async.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/async.c b/async.c
index cff0ab9..5fb3fa6 100644
--- a/async.c
+++ b/async.c
@@ -150,7 +150,10 @@ aio_ctx_prepare(GSource *source, gint *timeout)
{
AioContext *ctx = (AioContext *) source;
QEMUBH *bh;
+ int deadline;
+ /* We assume there is no timeout already supplied */
+ *timeout = -1;
for (bh = ctx->first_bh; bh; bh = bh->next) {
if (!bh->deleted && bh->scheduled) {
if (bh->idle) {
@@ -166,6 +169,14 @@ aio_ctx_prepare(GSource *source, gint *timeout)
}
}
+ deadline = qemu_timeout_ns_to_ms(timerlistgroup_deadline_ns(&ctx->tlg));
+ if (deadline == 0) {
+ *timeout = 0;
+ return true;
+ } else {
+ *timeout = qemu_soonest_timeout(*timeout, deadline);
+ }
+
return false;
}
@@ -180,7 +191,7 @@ aio_ctx_check(GSource *source)
return true;
}
}
- return aio_pending(ctx);
+ return aio_pending(ctx) || (timerlistgroup_deadline_ns(&ctx->tlg) == 0);
}
static gboolean
--
1.7.9.5
- [Qemu-devel] [PATCHv13 00/31] aio / timers: Add AioContext timers and use ppoll, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 01/31] aio / timers: Rename qemu_timer_* functions, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 02/31] aio / timers: Rename qemu_new_clock and expose clock types, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 04/31] aio / timers: Consistent treatment of disabled clocks for deadlines, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 07/31] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 06/31] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 11/31] aio / timers: Add QEMUTimerListGroup to AioContext, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 05/31] aio / timers: add ppoll support with qemu_poll_ns, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 13/31] aio / timers: aio_ctx_prepare sets timeout from AioContext timers,
Alex Bligh <=
- [Qemu-devel] [PATCHv13 14/31] aio / timers: Add aio_timer_init & aio_timer_new wrappers, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 12/31] aio / timers: Add a notify callback to QEMUTimerList, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 10/31] aio / timers: Add QEMUTimerListGroup and helper functions, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 22/31] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 09/31] aio / timers: Untangle include files, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 16/31] aio / timers: Convert mainloop to use timeout, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 23/31] aio / timers: Add qemu_clock_get_ms and qemu_clock_get_ms, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 19/31] aio / timers: Use all timerlists in icount warp calculations, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 17/31] aio / timers: On timer modification, qemu_notify or aio_notify, Alex Bligh, 2013/08/21
- [Qemu-devel] [PATCHv13 25/31] aio / timers: Remove main_loop_timerlist, Alex Bligh, 2013/08/21