From: Jesse Gross <jesse@nicira.com>
Date: Sun, 31 Jul 2011 21:47:32 +0000 (-0700)
Subject: poll-loop: Enable checking whether a FD caused a wakeup.
X-Git-Tag: v1.3.0~220
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1e276d1a10539a8cd97d2ad63c073a9a43f0f1ef;p=sliver-openvswitch.git

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

Each time we run through the poll loop, we check all file descriptors
that we were waiting on to see if there is data available.  However,
this requires a system call and poll already provides information on
which FDs caused the wakeup so it is inefficient as the number of
active FDs grows.  This provides a way to check whether a given FD
has data.
---

diff --git a/lib/netlink-socket.c b/lib/netlink-socket.c
index 3674bacbf..0f4e3e77d 100644
--- a/lib/netlink-socket.c
+++ b/lib/netlink-socket.c
@@ -668,6 +668,14 @@ 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 ff2485837..d789f4123 100644
--- a/lib/netlink-socket.h
+++ b/lib/netlink-socket.h
@@ -59,6 +59,7 @@ 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 5ff70d9ff..de080b4c9 100644
--- a/lib/poll-loop.c
+++ b/lib/poll-loop.c
@@ -62,6 +62,15 @@ 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);
 
@@ -210,11 +219,8 @@ 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, n_pollfds;
+    int n_waiters;
     int retval;
 
     /* Register fatal signal events before actually doing any real work for
@@ -275,6 +281,25 @@ 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;
+}
 
 /* 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 da8f6e206..fa06a07ff 100644
--- a/lib/poll-loop.h
+++ b/lib/poll-loop.h
@@ -65,6 +65,9 @@ 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