From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyk0m-00019j-Sa for qemu-devel@nongnu.org; Mon, 15 Jul 2013 10:44:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uyk0c-00025w-NV for qemu-devel@nongnu.org; Mon, 15 Jul 2013 10:44:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:37746) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uyk0b-00025a-TS for qemu-devel@nongnu.org; Mon, 15 Jul 2013 10:44:14 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r6FEiDC6005337 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Jul 2013 10:44:13 -0400 From: Stefan Hajnoczi Date: Mon, 15 Jul 2013 22:42:57 +0800 Message-Id: <1373899382-13514-9-git-send-email-stefanha@redhat.com> In-Reply-To: <1373899382-13514-1-git-send-email-stefanha@redhat.com> References: <1373899382-13514-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v2 08/13] main-loop: use thread-local AioContext List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , Stefan Hajnoczi qemu_bh_new() and several other functions use qemu_aio_context, the global QEMU main loop AioContext. Now that we have introduced threads with their own AioContext and a thread-local AioContext pointer, convert qemu_bh_new() and friends to use the thread-local AioContext pointer. qemu_bh_new() now creates a QEMUBH for the current thread's AioContext. This is the right thing to do - it allows existing code to work outside the main loop thread. One exception: qemu_notify_event() still uses the global qemu_aio_context because all callers expect to kick the main loop, not some other event loop. Signed-off-by: Stefan Hajnoczi --- main-loop.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/main-loop.c b/main-loop.c index 5af3963..5fbdd4a 100644 --- a/main-loop.c +++ b/main-loop.c @@ -320,7 +320,9 @@ void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque) void qemu_fd_register(int fd) { - WSAEventSelect(fd, event_notifier_get_handle(&qemu_aio_context->notifier), + AioContext *ctx = *tls_get_thread_aio_context(); + HANDLE h = event_notifier_get_handle(&ctx->notifier); + WSAEventSelect(fd, h, FD_READ | FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_WRITE | FD_OOB); } @@ -478,12 +480,12 @@ int main_loop_wait(int nonblocking) QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque) { - return aio_bh_new(qemu_aio_context, cb, opaque); + return aio_bh_new(*tls_get_thread_aio_context(), cb, opaque); } bool qemu_aio_wait(void) { - return aio_poll(qemu_aio_context, true); + return aio_poll(*tls_get_thread_aio_context(), true); } #ifdef CONFIG_POSIX @@ -493,8 +495,8 @@ void qemu_aio_set_fd_handler(int fd, AioFlushHandler *io_flush, void *opaque) { - aio_set_fd_handler(qemu_aio_context, fd, io_read, io_write, io_flush, - opaque); + aio_set_fd_handler(*tls_get_thread_aio_context(), fd, + io_read, io_write, io_flush, opaque); } #endif @@ -502,5 +504,6 @@ void qemu_aio_set_event_notifier(EventNotifier *notifier, EventNotifierHandler *io_read, AioFlushEventNotifierHandler *io_flush) { - aio_set_event_notifier(qemu_aio_context, notifier, io_read, io_flush); + aio_set_event_notifier(*tls_get_thread_aio_context(), notifier, + io_read, io_flush); } -- 1.8.1.4