From patchwork Thu Jan 31 10:54:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 217155 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6D07E2C0297 for ; Thu, 31 Jan 2013 21:55:31 +1100 (EST) Received: from localhost ([::1]:53322 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0rnl-0001qa-M6 for incoming@patchwork.ozlabs.org; Thu, 31 Jan 2013 05:55:29 -0500 Received: from eggs.gnu.org ([208.118.235.92]:38152) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0rmr-0000Vn-Fn for qemu-devel@nongnu.org; Thu, 31 Jan 2013 05:54:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U0rmm-00046W-TH for qemu-devel@nongnu.org; Thu, 31 Jan 2013 05:54:33 -0500 Received: from mx1.redhat.com ([209.132.183.28]:8109) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U0rmm-00046M-K9 for qemu-devel@nongnu.org; Thu, 31 Jan 2013 05:54:28 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0VAsRdu023929 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 31 Jan 2013 05:54:27 -0500 Received: from localhost (ovpn-112-28.ams2.redhat.com [10.36.112.28]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0VAsPbc000978; Thu, 31 Jan 2013 05:54:26 -0500 From: Stefan Hajnoczi To: Date: Thu, 31 Jan 2013 11:54:01 +0100 Message-Id: <1359629644-21920-9-git-send-email-stefanha@redhat.com> In-Reply-To: <1359629644-21920-1-git-send-email-stefanha@redhat.com> References: <1359629644-21920-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Anthony Liguori , Jan Kiszka , Fabien Chouteau , Stefan Hajnoczi , Paolo Bonzini , Amos Kong Subject: [Qemu-devel] [PATCH 08/11] main-loop: drop rfds/wfds/xfds for good X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Now that all *_fill() and *_poll() functions use Poller we no longer need rfds/wfds/xfds or poller_from_select()/poller_to_select(). From now on everything uses Poller. Signed-off-by: Stefan Hajnoczi --- main-loop.c | 73 ++----------------------------------------------------------- 1 file changed, 2 insertions(+), 71 deletions(-) diff --git a/main-loop.c b/main-loop.c index b638afb..4209b7c 100644 --- a/main-loop.c +++ b/main-loop.c @@ -142,62 +142,8 @@ int qemu_init_main_loop(void) } static Poller poller; -static fd_set rfds, wfds, xfds; -static int nfds; static int max_priority; -/* Load rfds/wfds/xfds into Poller. Will be removed a few commits later. */ -static void poller_from_select(void) -{ - int fd; - for (fd = 0; fd <= nfds; fd++) { - int events = 0; - if (FD_ISSET(fd, &rfds)) { - events |= G_IO_IN | G_IO_HUP | G_IO_ERR; - } - if (FD_ISSET(fd, &wfds)) { - events |= G_IO_OUT | G_IO_ERR; - } - if (FD_ISSET(fd, &xfds)) { - events |= G_IO_PRI; - } - if (events) { - poller_add_fd(&poller, fd, events); - } - } -} - -/* Store Poller revents into rfds/wfds/xfds. Will be removed a few commits - * later. - */ -static void poller_to_select(int ret) -{ - int i; - - FD_ZERO(&rfds); - FD_ZERO(&wfds); - FD_ZERO(&xfds); - - if (ret <= 0) { - return; - } - - for (i = 0; i < poller.nfds; i++) { - int fd = poller.poll_fds[i].fd; - int revents = poller.poll_fds[i].revents; - - if (revents & (G_IO_IN | G_IO_HUP | G_IO_ERR)) { - FD_SET(fd, &rfds); - } - if (revents & (G_IO_OUT | G_IO_ERR)) { - FD_SET(fd, &wfds); - } - if (revents & G_IO_PRI) { - FD_SET(fd, &xfds); - } - } -} - #ifndef _WIN32 static int glib_poller_idx; static int glib_n_poll_fds; @@ -256,15 +202,8 @@ static int os_host_main_loop_wait(uint32_t timeout) qemu_mutex_unlock_iothread(); } - /* We'll eventually drop fd_set completely. But for now we still have - * *_fill() and *_poll() functions that use rfds/wfds/xfds. - */ - poller_from_select(); - ret = g_poll(poller.poll_fds, poller.nfds, timeout); - poller_to_select(ret); - if (timeout > 0) { qemu_mutex_lock_iothread(); } @@ -373,6 +312,8 @@ static int os_host_main_loop_wait(uint32_t timeout) WaitObjects *w = &wait_objects; gint poll_timeout; static struct timeval tv0; + fd_set rfds, wfds, xfds; + int nfds; /* XXX: need to suppress polling by better using win32 events */ ret = 0; @@ -419,10 +360,6 @@ static int os_host_main_loop_wait(uint32_t timeout) * improve socket latency. */ - /* This back-and-forth between Poller and select(2) is temporary. We'll - * drop it in a couple of patches, I promise :). - */ - poller_from_select(); FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&xfds); @@ -434,7 +371,6 @@ static int os_host_main_loop_wait(uint32_t timeout) poller_poll(&poller, nfds, &rfds, &wfds, &xfds); } } - poller_to_select(select_ret || g_poll_ret); return select_ret || g_poll_ret; } @@ -452,11 +388,6 @@ int main_loop_wait(int nonblocking) /* poll any events */ poller_reset(&poller); /* XXX: separate device handlers from system ones */ - nfds = -1; - FD_ZERO(&rfds); - FD_ZERO(&wfds); - FD_ZERO(&xfds); - #ifdef CONFIG_SLIRP slirp_update_timeout(&timeout); slirp_poller_fill(&poller);