MINOR: polling: create function fd_compute_new_polled_status()

This function is used to compute the new polling state based on
the previous state. All pollers have to do this in their update
loop, so better centralize the logic for it.

diff --git a/include/proto/fd.h b/include/proto/fd.h
index f74fbcbb526ae9f0e58bb5240947cdd17d2b0e72..605dc215ff2758e8722a12f91ad307e9e2a07e5a 100644 (file)
--- a/include/proto/fd.h
+++ b/include/proto/fd.h
@@ -135,6 +135,28 @@ static inline void fd_release_cache_entry(int fd)
        }
 }
 
+/* Computes the new polled status based on the active and ready statuses, for
+ * each direction. This is meant to be used by pollers while processing updates.
+ */
+static inline int fd_compute_new_polled_status(int state)
+{
+       if (state & FD_EV_ACTIVE_R) {
+               if (!(state & FD_EV_READY_R))
+                       state |= FD_EV_POLLED_R;
+       }
+       else
+               state &= ~FD_EV_POLLED_R;
+
+       if (state & FD_EV_ACTIVE_W) {
+               if (!(state & FD_EV_READY_W))
+                       state |= FD_EV_POLLED_W;
+       }
+       else
+               state &= ~FD_EV_POLLED_W;
+
+       return state;
+}
+
 /* Automatically allocates or releases a cache entry for fd <fd> depending on
  * its new state. This is meant to be used by pollers while processing updates.
  */

diff --git a/src/ev_epoll.c b/src/ev_epoll.c
index b90d9c153e2a92c2b1a0dfefcf1e3595c04ffee4..2849ec6c1712c146da178fb48a93b4b32dd51c7a 100644 (file)
--- a/src/ev_epoll.c
+++ b/src/ev_epoll.c
@@ -59,27 +59,14 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
        /* first, scan the update list to find changes */
        for (updt_idx = 0; updt_idx < fd_nbupdt; updt_idx++) {
                fd = fd_updt[updt_idx];
-               en = eo = fdtab[fd].state;
-
                fdtab[fd].updated = 0;
                fdtab[fd].new = 0;
 
                if (!fdtab[fd].owner)
                        continue;
 
-               if (en & FD_EV_ACTIVE_R) {
-                       if (!(en & FD_EV_READY_R))
-                               en |= FD_EV_POLLED_R;
-               }
-               else
-                       en &= ~FD_EV_POLLED_R;
-
-               if (en & FD_EV_ACTIVE_W) {
-                       if (!(en & FD_EV_READY_W))
-                               en |= FD_EV_POLLED_W;
-               }
-               else
-                       en &= ~FD_EV_POLLED_W;
+               eo = fdtab[fd].state;
+               en = fd_compute_new_polled_status(eo);
 
                if ((eo ^ en) & FD_EV_POLLED_RW) {
                        /* poll status changed */

diff --git a/src/ev_kqueue.c b/src/ev_kqueue.c
index 0473adc349a8a56a0edb561bbd281cb53ff5570f..06ccaee292ab17a10e9427b91e64ae94be5f046a 100644 (file)
--- a/src/ev_kqueue.c
+++ b/src/ev_kqueue.c
@@ -47,28 +47,14 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
        /* first, scan the update list to find changes */
        for (updt_idx = 0; updt_idx < fd_nbupdt; updt_idx++) {
                fd = fd_updt[updt_idx];
-               en = eo = fdtab[fd].state;
-
                fdtab[fd].updated = 0;
                fdtab[fd].new = 0;
 
                if (!fdtab[fd].owner)
                        continue;
 
-               if (en & FD_EV_ACTIVE_R) {
-                       if (!(en & FD_EV_READY_R))
-                               en |= FD_EV_POLLED_R;
-               }
-               else
-                       en &= ~FD_EV_POLLED_R;
-
-               if (en & FD_EV_ACTIVE_W) {
-                       if (!(en & FD_EV_READY_W))
-                               en |= FD_EV_POLLED_W;
-               }
-               else
-                       en &= ~FD_EV_POLLED_W;
-
+               eo = fdtab[fd].state;
+               en = fd_compute_new_polled_status(eo);
 
                if ((eo ^ en) & FD_EV_POLLED_RW) {
                        /* poll status changed */

diff --git a/src/ev_poll.c b/src/ev_poll.c
index 84ba486b8914bff9a3d8acc783fa403080349eb0..2f6e56d3c43d4a6abe9c30982f0864f59e3b7b7f 100644 (file)
--- a/src/ev_poll.c
+++ b/src/ev_poll.c
@@ -70,27 +70,14 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
        /* first, scan the update list to find changes */
        for (updt_idx = 0; updt_idx < fd_nbupdt; updt_idx++) {
                fd = fd_updt[updt_idx];
-               en = eo = fdtab[fd].state;
-
                fdtab[fd].updated = 0;
                fdtab[fd].new = 0;
 
                if (!fdtab[fd].owner)
                        continue;
 
-               if (en & FD_EV_ACTIVE_R) {
-                       if (!(en & FD_EV_READY_R))
-                               en |= FD_EV_POLLED_R;
-               }
-               else
-                       en &= ~FD_EV_POLLED_R;
-
-               if (en & FD_EV_ACTIVE_W) {
-                       if (!(en & FD_EV_READY_W))
-                               en |= FD_EV_POLLED_W;
-               }
-               else
-                       en &= ~FD_EV_POLLED_W;
+               eo = fdtab[fd].state;
+               en = fd_compute_new_polled_status(eo);
 
                if ((eo ^ en) & FD_EV_POLLED_RW) {
                        /* poll status changed, update the lists */

diff --git a/src/ev_select.c b/src/ev_select.c
index 87ca348a680b41bf6bcc2d3cfe42d4ce30937090..5a76d44c074af54b93f791ab4693e3d67d291e05 100644 (file)
--- a/src/ev_select.c
+++ b/src/ev_select.c
@@ -53,27 +53,14 @@ REGPRM2 static void _do_poll(struct poller *p, int exp)
        /* first, scan the update list to find changes */
        for (updt_idx = 0; updt_idx < fd_nbupdt; updt_idx++) {
                fd = fd_updt[updt_idx];
-               en = eo = fdtab[fd].state;
-
                fdtab[fd].updated = 0;
                fdtab[fd].new = 0;
 
                if (!fdtab[fd].owner)
                        continue;
 
-               if (en & FD_EV_ACTIVE_R) {
-                       if (!(en & FD_EV_READY_R))
-                               en |= FD_EV_POLLED_R;
-               }
-               else
-                       en &= ~FD_EV_POLLED_R;
-
-               if (en & FD_EV_ACTIVE_W) {
-                       if (!(en & FD_EV_READY_W))
-                               en |= FD_EV_POLLED_W;
-               }
-               else
-                       en &= ~FD_EV_POLLED_W;
+               eo = fdtab[fd].state;
+               en = fd_compute_new_polled_status(eo);
 
                if ((eo ^ en) & FD_EV_POLLED_RW) {
                        /* poll status changed, update the lists */