Revert "poll-loop: Enable checking whether a FD caused a wakeup."

This reverts commit 1e276d1a10539a8cd97d2ad63c073a9a43f0f1ef.
The poll_fd_woke() and nl_sock_woke() function added in that commit are
no longer used, so there is no reason to keep them in the tree.

diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
index f117a6a26e10afadd5454a3c9f9364ff4d657d03..3e64de39f8426d3b70ac7b5d3996c6d538604d98 100644 (file)
--- a/lib/netlink-socket.c
+++ b/lib/netlink-socket.c
@@ -854,14 +854,6 @@ nl_sock_wait(const struct nl_sock *sock, short int events)
     poll_fd_wait(sock->fd, events);
 }
 
-/* Checks whether this socket caused a wakeup in the previous run of the poll
- * loop. */
-short int
-nl_sock_woke(const struct nl_sock *sock)
-{
-    return poll_fd_woke(sock->fd);
-}
-
 /* Returns the PID associated with this socket. */
 uint32_t
 nl_sock_pid(const struct nl_sock *sock)

diff --git a/lib/netlink-socket.h b/lib/netlink-socket.h
index 7e01acbfa19c97fc39845ff0e7ca2a2287733d10..b6356b9e21275affc3c87815dc5793a957febbc1 100644 (file)
--- a/lib/netlink-socket.h
+++ b/lib/netlink-socket.h
@@ -60,7 +60,6 @@ int nl_sock_transact(struct nl_sock *, const struct ofpbuf *request,
 int nl_sock_drain(struct nl_sock *);
 
 void nl_sock_wait(const struct nl_sock *, short int events);
-short int nl_sock_woke(const struct nl_sock *);
 
 uint32_t nl_sock_pid(const struct nl_sock *);
 

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 *

diff --git a/lib/poll-loop.h b/lib/poll-loop.h
index fa06a07ff757818015ff9ca855cf5dd406174ec7..da8f6e2063959e0dc7f3c52930e7c2a3bc9d9247 100644 (file)
--- a/lib/poll-loop.h
+++ b/lib/poll-loop.h
@@ -65,9 +65,6 @@ void poll_block(void);
 /* Cancel a file descriptor callback or event. */
 void poll_cancel(struct poll_waiter *);
 
-/* Checks whether the file descriptor caused a wakeup. */
-short int poll_fd_woke(int fd);
-
 #ifdef  __cplusplus
 }
 #endif