From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4oZS-0005aj-A7 for qemu-devel@nongnu.org; Wed, 09 Jul 2014 05:53:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1X4oZJ-00014w-1x for qemu-devel@nongnu.org; Wed, 09 Jul 2014 05:53:50 -0400 Received: from mail-qc0-x22d.google.com ([2607:f8b0:400d:c01::22d]:37562) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1X4oZI-00014q-UE for qemu-devel@nongnu.org; Wed, 09 Jul 2014 05:53:40 -0400 Received: by mail-qc0-f173.google.com with SMTP id c9so566841qcz.18 for ; Wed, 09 Jul 2014 02:53:40 -0700 (PDT) Received: from yakj.usersys.redhat.com (net-2-35-201-190.cust.vodafonedsl.it. [2.35.201.190]) by mx.google.com with ESMTPSA id j97sm31669122qgd.37.2014.07.09.02.53.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 Jul 2014 02:53:39 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Wed, 9 Jul 2014 11:53:08 +0200 Message-Id: <1404899590-24973-9-git-send-email-pbonzini@redhat.com> In-Reply-To: <1404899590-24973-1-git-send-email-pbonzini@redhat.com> References: <1404899590-24973-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 08/10] AioContext: introduce aio_prepare List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org This will be used to implement socket polling on Windows. On Windows, select() and g_poll() are completely different; sockets are polled with select() before calling g_poll, and the g_poll must be nonblocking if select() says a socket is ready. Signed-off-by: Paolo Bonzini --- aio-posix.c | 5 +++++ aio-win32.c | 5 +++++ async.c | 5 +++++ include/block/aio.h | 9 ++++++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/aio-posix.c b/aio-posix.c index 0936b4f..d3ac06e 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -100,6 +100,11 @@ void aio_set_event_notifier(AioContext *ctx, (IOHandler *)io_read, NULL, notifier); } +bool aio_prepare(AioContext *ctx) +{ + return false; +} + bool aio_pending(AioContext *ctx) { AioHandler *node; diff --git a/aio-win32.c b/aio-win32.c index fd52686..4542270 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -76,6 +76,11 @@ void aio_set_event_notifier(AioContext *ctx, aio_notify(ctx); } +bool aio_prepare(AioContext *ctx) +{ + return false; +} + bool aio_pending(AioContext *ctx) { AioHandler *node; diff --git a/async.c b/async.c index a5126ff..bcba052 100644 --- a/async.c +++ b/async.c @@ -188,6 +188,11 @@ aio_ctx_prepare(GSource *source, gint *timeout) /* We assume there is no timeout already supplied */ *timeout = qemu_timeout_ns_to_ms(aio_compute_timeout(ctx)); + + if (aio_prepare(ctx)) { + *timeout = 0; + } + return *timeout == 0; } diff --git a/include/block/aio.h b/include/block/aio.h index 45408f7..d129e22 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -205,7 +205,14 @@ void qemu_bh_cancel(QEMUBH *bh); void qemu_bh_delete(QEMUBH *bh); /* Return whether there are any pending callbacks from the GSource - * attached to the AioContext. + * attached to the AioContext, before g_poll is invoked. + * + * This is used internally in the implementation of the GSource. + */ +bool aio_prepare(AioContext *ctx); + +/* Return whether there are any pending callbacks from the GSource + * attached to the AioContext, after g_poll is invoked. * * This is used internally in the implementation of the GSource. */ -- 1.9.3