[Qemu-devel] [PATCH 08/11] main-loop: drop rfds/wfds/xfds for good

[Stefan Hajnoczi]

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 <address@hidden>
---
 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);
-- 
1.8.1