From d3fa923044321b2ccc12bbdedd582d2c49d958aa Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Tue, 26 Nov 2013 16:18:01 +0100 Subject: aio: make aio_poll(ctx, true) block with no fds This patch drops a special case where aio_poll(ctx, true) returns false instead of blocking if no file descriptors are waiting on I/O. Now it is possible to block in aio_poll() to wait for aio_notify(). This change eliminates busy waiting. bdrv_drain_all() used to rely on busy waiting to completed throttled I/O requests but this is no longer required so we can simplify aio_poll(). Note that aio_poll() still returns false when aio_notify() was used. In other words, stopping a blocking aio_poll() wait is not considered making progress. Adjust test-aio /aio/bh/callback-delete/one which assumed aio_poll(ctx, true) would immediately return false instead of blocking. Reviewed-by: Alex Bligh Signed-off-by: Stefan Hajnoczi --- tests/test-aio.c | 1 - 1 file changed, 1 deletion(-) (limited to 'tests') diff --git a/tests/test-aio.c b/tests/test-aio.c index c4fe0fc3b7..592721ed3f 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -195,7 +195,6 @@ static void test_bh_delete_from_cb(void) g_assert(data1.bh == NULL); g_assert(!aio_poll(ctx, false)); - g_assert(!aio_poll(ctx, true)); } static void test_bh_delete_from_cb_many(void) -- cgit v1.2.3