REORG: polling: rename "fd_process_spec_events()" to "fd_process_cached_events()"

This is in order to be coherent with the rest.

diff --git a/include/proto/fd.h b/include/proto/fd.h
index 897c2d357a8e7881ca2a521ab966eb6a3ea64acf..1ca9b35382ed6743120e91c718e358e9a6b49550 100644 (file)
--- a/include/proto/fd.h
+++ b/include/proto/fd.h
@@ -76,10 +76,10 @@ int list_pollers(FILE *out);
  */
 void run_poller();
 
-/* Scan and process the speculative events. This should be called right after
+/* Scan and process the cached events. This should be called right after
  * the poller.
  */
-void fd_process_spec_events();
+void fd_process_cached_events();
 
 /* Mark fd <fd> as updated and allocate an entry in the update list for this if
  * it was not already there. This can be done at any time.

diff --git a/src/fd.c b/src/fd.c
index f3d63d92b18aa0f2e36f95962f0c9945fca07798..45e30336c2bc82ed55ba1ab8dbba2e5ea5e8a647 100644 (file)
--- a/src/fd.c
+++ b/src/fd.c
@@ -136,29 +136,23 @@ void fd_delete(int fd)
                maxfd--;
 }
 
-/* Scan and process the speculative events. This should be called right after
+/* Scan and process the cached events. This should be called right after
  * the poller.
  */
-void fd_process_spec_events()
+void fd_process_cached_events()
 {
-       int fd, spec_idx, e;
+       int fd, entry, e;
 
-       /* now process speculative events if any */
-
-       for (spec_idx = 0; spec_idx < fd_cache_num; ) {
-               fd = fd_cache[spec_idx];
+       for (entry = 0; entry < fd_cache_num; ) {
+               fd = fd_cache[entry];
                e = fdtab[fd].state;
 
-               /*
-                * Process the speculative events.
-                *
-                * Principle: events which are marked FD_EV_ACTIVE are processed
+               /* Principle: events which are marked FD_EV_ACTIVE are processed
                 * with their usual I/O callback. The callback may remove the
-                * events from the list or tag them for polling. Changes will be
-                * applied on next round. Speculative entries with no more activity
-                * are automatically scheduled for removal.
+                * events from the cache or tag them for polling. Changes will be
+                * applied on next round. Cache entries with no more activity are
+                * automatically scheduled for removal.
                 */
-
                fdtab[fd].ev &= FD_POLL_STICKY;
 
                if (e & FD_EV_ACTIVE_R)
@@ -172,13 +166,12 @@ void fd_process_spec_events()
                else
                        updt_fd(fd);
 
-               /* if the fd was removed from the spec list, it has been
+               /* If the fd was removed from the cache, it has been
                 * replaced by the next one that we don't want to skip !
                 */
-               if (spec_idx < fd_cache_num && fd_cache[spec_idx] != fd)
+               if (entry < fd_cache_num && fd_cache[entry] != fd)
                        continue;
-
-               spec_idx++;
+               entry++;
        }
 }
 

diff --git a/src/haproxy.c b/src/haproxy.c
index 5cfebd29a05dc5b8b89e0bd9f3937f629310112e..fd6006dc4a6df5593312e37b08b330da6b296751 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1283,7 +1283,7 @@ void run_poll_loop()
 
                /* The poller will ensure it returns around <next> */
                cur_poller.poll(&cur_poller, next);
-               fd_process_spec_events();
+               fd_process_cached_events();
        }
 }