ovsdb: Correctly implement conditions that include multiple clauses.

[openvswitch] / lib / poll-loop.c

diff --git a/lib/poll-loop.c b/lib/poll-loop.c
index de080b4c9e5d28c49fa4997fc92f5f1cf68f426a..5ff70d9ff5d9c73ccf7d3098cad81616cf1978d3 100644 (file)
--- a/lib/poll-loop.c
+++ b/lib/poll-loop.c
@@ -62,15 +62,6 @@ static int timeout = -1;
 /* Location where waiter created. */
 static const char *timeout_where;
 
-/* Array of file descriptors from last run of poll_block(). */
-static struct pollfd *pollfds;
-
-/* Allocated size of pollfds. */
-static size_t max_pollfds;
-
-/* Current number of elements in pollfds. */
-static int n_pollfds;
-
 static struct poll_waiter *new_waiter(int fd, short int events,
                                       const char *where);
 
@@ -219,8 +210,11 @@ log_wakeup(const char *where, const struct pollfd *pollfd, int timeout)
 void
 poll_block(void)
 {
+    static struct pollfd *pollfds;
+    static size_t max_pollfds;
+
     struct poll_waiter *pw, *next;
-    int n_waiters;
+    int n_waiters, n_pollfds;
     int retval;
 
     /* Register fatal signal events before actually doing any real work for
@@ -281,25 +275,6 @@ poll_cancel(struct poll_waiter *pw)
         free(pw);
     }
 }
-
-/* Checks whether the given file descriptor caused the poll loop to wake up
- * in the previous iteration.  If it did, returns a bitmask of the events
- * that caused the wakeup.  Otherwise returns 0;
- */
-short int
-poll_fd_woke(int fd)
-{
-    int i;
-    short int events = 0;
-
-    for (i = 0; i < n_pollfds; i++) {
-        if (pollfds[i].fd == fd) {
-            events |= pollfds[i].revents;
-        }
-    }
-
-    return events;
-}
 \f
 /* Creates and returns a new poll_waiter for 'fd' and 'events'. */
 static struct poll_waiter *