More action registration reshuffling.

diff --git a/src/comm_kqueue.cc b/src/comm_kqueue.cc
index bc12fd33f36236edd792f131a4ce0186e6e98d2b..0bf475463e4874cf7d531683f8756c6899e31a79 100644 (file)
--- a/src/comm_kqueue.cc
+++ b/src/comm_kqueue.cc
@@ -177,6 +177,8 @@ comm_select_init(void)
     kqlst = (struct kevent *)xmalloc(sizeof(*kqlst) * kqmax);
     zero_timespec.tv_sec = 0;
     zero_timespec.tv_nsec = 0;
+
+    commKQueueRegisterWithCacheManager();
 }
 
 /*

diff --git a/src/comm_poll.cc b/src/comm_poll.cc
index 95e5084eaf89b89b84cc90f8dafca469655c5db4..4675a6c939d86638232c2db75ff0075279e59eb4 100644 (file)
--- a/src/comm_poll.cc
+++ b/src/comm_poll.cc
@@ -603,7 +603,9 @@ comm_poll_dns_incoming(void)
 
 void
 comm_select_init(void)
-{}
+{
+    commPollRegisterWithCacheManager();
+}
 
 void
 commPollRegisterWithCacheManager(void)

diff --git a/src/comm_select.cc b/src/comm_select.cc
index 3b35befb00804fdc469e0f89782ff7e39ba162d1..e29aeada87c05420f10b584fbbceaa706f5016db 100644 (file)
--- a/src/comm_select.cc
+++ b/src/comm_select.cc
@@ -662,6 +662,8 @@ comm_select_init(void)
     FD_ZERO(&global_readfds);
     FD_ZERO(&global_writefds);
     nreadfds = nwritefds = 0;
+
+    commSelectRegisterWithCacheManager();
 }
 
 void

diff --git a/src/comm_select_win32.cc b/src/comm_select_win32.cc
index 53daf3919cf4d09cf3ebdbd421a3390d60cbb753..270e497271db97eb29d2614d79c41badc5f82f05 100644 (file)
--- a/src/comm_select_win32.cc
+++ b/src/comm_select_win32.cc
@@ -684,6 +684,8 @@ comm_select_init(void)
     FD_ZERO(&global_readfds);
     FD_ZERO(&global_writefds);
     nreadfds = nwritefds = 0;
+
+    commSelectRegisterWithCacheManager();
 }
 
 void

diff --git a/src/main.cc b/src/main.cc
index aef3fbe41d13f1876d8f1b2db3d1f4c43494b9de..577951149e4763bd3c68064fee31dde134077b22 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -980,15 +980,13 @@ mainInitialize(void)
 #endif
 #ifdef USE_KQUEUE
 
-        commKQueueRegisterWithCacheManager();
+        // commKQueueRegisterWithCacheManager(); //moved to comm_kqueue::comm_select_init()
 #endif
 #ifdef USE_POLL
-
-        commPollRegisterWithCacheManager();
+        // commPollRegisterWithCacheManager(); //moved to comm_poll::comm_select_init
 #endif
 #if defined(USE_SELECT) || defined(USE_SELECT_WIN32)
-
-        commSelectRegisterWithCacheManager();
+        // commSelectRegisterWithCacheManager(); // moved to comm_select::comm_select_init
 #endif
 
         clientdbRegisterWithCacheManager();