From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 9 Jul 2008 20:33:02 +0000 (+0200)
Subject: Refactored actions for comm_poll to Cache Manager singleton API.
X-Git-Tag: SQUID_3_1_0_1~49^2~143^2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=edfab338731042dc8c0f853a7d2b7835ed661639;p=thirdparty%2Fsquid.git

Refactored actions for comm_poll to Cache Manager singleton API.
---

diff --git a/src/comm_poll.cc b/src/comm_poll.cc
index da2fc42c2a..95e5084eaf 100644
--- a/src/comm_poll.cc
+++ b/src/comm_poll.cc
@@ -606,11 +606,12 @@ comm_select_init(void)
 {}
 
 void
-commPollRegisterWithCacheManager(CacheManager & manager)
+commPollRegisterWithCacheManager(void)
 {
-    manager.registerAction("comm_poll_incoming",
-                           "comm_incoming() stats",
-                           commIncomingStats, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("comm_poll_incoming",
+                       "comm_incoming() stats",
+                       commIncomingStats, 0, 1);
 }
 
 
diff --git a/src/comm_poll.h b/src/comm_poll.h
index 3c0f69321e..93f7b7a72f 100644
--- a/src/comm_poll.h
+++ b/src/comm_poll.h
@@ -38,6 +38,6 @@
 
 class CacheManager;
 
-extern void commPollRegisterWithCacheManager(CacheManager & manager);
+extern void commPollRegisterWithCacheManager(void);
 
 #endif /* SQUID_COMM_POLL_H */
diff --git a/src/main.cc b/src/main.cc
index 6b728a2475..d8aeaa5a43 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -989,7 +989,7 @@ mainInitialize(void)
 #endif
 #ifdef USE_POLL
 
-        commPollRegisterWithCacheManager(*manager);
+        commPollRegisterWithCacheManager();
 #endif
 #if defined(USE_SELECT) || defined(USE_SELECT_WIN32)