Refactored actions for epoll to Cache Manager singleton API.

Fixed issue with cbdata initialization prototype.

diff --git a/src/cbdata.cc b/src/cbdata.cc
index ddd64679850c8fc16a6e13ac6fc001548d616c12..462354d74caea8f96eecc395201a2604ea507de1 100644 (file)
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -271,7 +271,7 @@ cbdataInternalAddType(cbdata_type type, const char *name, int size, FREE * free_
 }
 
 void
-cbdataRegisterWithCacheManager()
+cbdataRegisterWithCacheManager(void)
 {
     CacheManager *manager=CacheManager::GetInstance();
     manager->registerAction("cbdata",

diff --git a/src/cbdata.h b/src/cbdata.h
index 5e4e9b3cabbfca5589abab6c10e2204e07dd7616..6a9eb4f750038544421c043c217f7b70c784bc63 100644 (file)
--- a/src/cbdata.h
+++ b/src/cbdata.h
@@ -236,7 +236,7 @@ typedef enum {
 } cbdata_type;
 
 /// \ingroup CBDATAAPI
-extern void cbdataRegisterWithCacheManager();
+extern void cbdataRegisterWithCacheManager(void);
 
 #if CBDATA_DEBUG
 extern void *cbdataInternalAllocDbg(cbdata_type type, const char *, int);

diff --git a/src/comm_epoll.cc b/src/comm_epoll.cc
index 758fd8817ce7e946c6ada68a3abfb3b62038a9d2..6eedd357c264c5160c060adab9f8aec20398e46c 100644 (file)
--- a/src/comm_epoll.cc
+++ b/src/comm_epoll.cc
@@ -215,11 +215,12 @@ commResetSelect(int fd)
 static void commIncomingStats(StoreEntry * sentry);
 
 void
-commEPollRegisterWithCacheManager(CacheManager& manager)
+commEPollRegisterWithCacheManager(void)
 {
-    manager.registerAction("comm_epoll_incoming",
-                           "comm_incoming() stats",
-                           commIncomingStats, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("comm_epoll_incoming",
+                       "comm_incoming() stats",
+                        commIncomingStats, 0, 1);
 }
 
 static void

diff --git a/src/comm_epoll.h b/src/comm_epoll.h
index 9df46272ef4b08f7017de296647193c534b12da5..0e5a54b9f47c224be040b234c4da4037e67da2b4 100644 (file)
--- a/src/comm_epoll.h
+++ b/src/comm_epoll.h
@@ -38,6 +38,6 @@
 
 class CacheManager;
 
-extern void commEPollRegisterWithCacheManager(CacheManager & manager);
+extern void commEPollRegisterWithCacheManager(void);
 
 #endif /* SQUID_COMM_EPOLL_H */

diff --git a/src/main.cc b/src/main.cc
index 921a036031e3b4a40603995744cbf896c8e76c5c..c9cb5060c6716c640aaa6484d9cfb96779a79731 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -981,7 +981,7 @@ mainInitialize(void)
          */
 #ifdef USE_EPOLL
 
-        commEPollRegisterWithCacheManager(*manager);
+        commEPollRegisterWithCacheManager();
 #endif
 #ifdef USE_KQUEUE