From patchwork Fri Feb 1 13:53:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 217461 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 C0C322C0293 for ; Sat, 2 Feb 2013 00:54:38 +1100 (EST) Received: from localhost ([::1]:34406 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1H4e-0000wp-MT for incoming@patchwork.ozlabs.org; Fri, 01 Feb 2013 08:54:36 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1H4F-0000en-R6 for qemu-devel@nongnu.org; Fri, 01 Feb 2013 08:54:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U1H4C-0006V2-Dq for qemu-devel@nongnu.org; Fri, 01 Feb 2013 08:54:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U1H4C-0006Ur-7J for qemu-devel@nongnu.org; Fri, 01 Feb 2013 08:54:08 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r11Ds680026772 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 1 Feb 2013 08:54:06 -0500 Received: from localhost (ovpn-112-26.ams2.redhat.com [10.36.112.26]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r11Ds5Gm027631; Fri, 1 Feb 2013 08:54:06 -0500 From: Stefan Hajnoczi To: Date: Fri, 1 Feb 2013 14:53:25 +0100 Message-Id: <1359726808-11728-7-git-send-email-stefanha@redhat.com> In-Reply-To: <1359726808-11728-1-git-send-email-stefanha@redhat.com> References: <1359726808-11728-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 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 v2 6/9] 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 GPollFD we no longer need rfds/wfds/xfds or pollfds_from_select()/pollfds_to_select(). From now on everything uses GPollFD. Signed-off-by: Stefan Hajnoczi --- main-loop.c | 77 ++----------------------------------------------------------- 1 file changed, 2 insertions(+), 75 deletions(-) diff --git a/main-loop.c b/main-loop.c index 313f369..587cc30 100644 --- a/main-loop.c +++ b/main-loop.c @@ -143,66 +143,8 @@ int qemu_init_main_loop(void) return 0; } -static fd_set rfds, wfds, xfds; -static int nfds; static int max_priority; -/* Load rfds/wfds/xfds into gpollfds. Will be removed a few commits later. */ -static void gpollfds_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) { - GPollFD pfd = { - .fd = fd, - .events = events, - }; - g_array_append_val(gpollfds, pfd); - } - } -} - -/* Store gpollfds revents into rfds/wfds/xfds. Will be removed a few commits - * later. - */ -static void gpollfds_to_select(int ret) -{ - int i; - - FD_ZERO(&rfds); - FD_ZERO(&wfds); - FD_ZERO(&xfds); - - if (ret <= 0) { - return; - } - - for (i = 0; i < gpollfds->len; i++) { - int fd = g_array_index(gpollfds, GPollFD, i).fd; - int revents = g_array_index(gpollfds, GPollFD, 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_pollfds_idx; static int glib_n_poll_fds; @@ -251,15 +193,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. - */ - gpollfds_from_select(); - ret = g_poll((GPollFD *)gpollfds->data, gpollfds->len, timeout); - gpollfds_to_select(ret); - if (timeout > 0) { qemu_mutex_lock_iothread(); } @@ -417,6 +352,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; @@ -463,10 +400,6 @@ static int os_host_main_loop_wait(uint32_t timeout) * improve socket latency. */ - /* This back-and-forth between GPollFDs and select(2) is temporary. We'll - * drop it in a couple of patches, I promise :). - */ - gpollfds_from_select(); FD_ZERO(&rfds); FD_ZERO(&wfds); FD_ZERO(&xfds); @@ -478,7 +411,6 @@ static int os_host_main_loop_wait(uint32_t timeout) pollfds_poll(gpollfds, nfds, &rfds, &wfds, &xfds); } } - gpollfds_to_select(select_ret || g_poll_ret); return select_ret || g_poll_ret; } @@ -496,11 +428,6 @@ int main_loop_wait(int nonblocking) /* poll any events */ g_array_set_size(gpollfds, 0); /* reset for new iteration */ /* 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_pollfds_fill(gpollfds);