Refactored actions for clientdb, comm_select, dns and idns to

Cache Manager singleton API.

diff --git a/src/client_db.cc b/src/client_db.cc
index 39df170a53908de6ffb723b3994fa720ea5b2492..5d0cf8a75f95627a51bedbef498b7b9061f4ca54 100644 (file)
--- a/src/client_db.cc
+++ b/src/client_db.cc
@@ -85,12 +85,10 @@ clientdbInit(void)
 }
 
 void
-clientdbRegisterWithCacheManager(CacheManager & manager)
+clientdbRegisterWithCacheManager(void)
 {
-    manager.registerAction("client_list",
-                           "Cache Client List",
-                           clientdbDump,
-                           0, 1);
+    CacheManager::GetInstance()->
+        registerAction("client_list", "Cache Client List", clientdbDump, 0, 1);
 }
 
 void

diff --git a/src/comm_select.cc b/src/comm_select.cc
index 9d778197deb1c758fff6fd303afe911006607bea..3b35befb00804fdc469e0f89782ff7e39ba162d1 100644 (file)
--- a/src/comm_select.cc
+++ b/src/comm_select.cc
@@ -665,11 +665,12 @@ comm_select_init(void)
 }
 
 void
-commSelectRegisterWithCacheManager(CacheManager & manager)
+commSelectRegisterWithCacheManager(void)
 {
-    manager.registerAction("comm_select_incoming",
-                           "comm_incoming() stats",
-                           commIncomingStats, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("comm_select_incoming",
+                       "comm_incoming() stats",
+                       commIncomingStats, 0, 1);
 }
 
 /*

diff --git a/src/comm_select.h b/src/comm_select.h
index ac9d37dfe545a6b5ef7593c77339c2c4a9e7bd72..9f95ef57085bb2c8fe466f137172da98fe6c6e51 100644 (file)
--- a/src/comm_select.h
+++ b/src/comm_select.h
@@ -38,6 +38,6 @@
 
 class CacheManager;
 
-extern void commSelectRegisterWithCacheManager(CacheManager & manager);
+extern void commSelectRegisterWithCacheManager(void);
 
 #endif /* SQUID_COMM_SELECT_H */

diff --git a/src/comm_select_win32.cc b/src/comm_select_win32.cc
index a09ea5e160002d03170ec5027f6d9f71872dd31f..53daf3919cf4d09cf3ebdbd421a3390d60cbb753 100644 (file)
--- a/src/comm_select_win32.cc
+++ b/src/comm_select_win32.cc
@@ -687,9 +687,10 @@ comm_select_init(void)
 }
 
 void
-commSelectRegisterWithCacheManager(CacheManager & manager)
+commSelectRegisterWithCacheManager(void)
 {
-    manager.registerAction("comm_select_incoming",
+    CacheManager::GetInstance()->
+            registerAction("comm_select_incoming",
                            "comm_incoming() stats",
                            commIncomingStats, 0, 1);
 }

diff --git a/src/dns.cc b/src/dns.cc
index 0df6d429d1b4d102fe5a5686e0ac70efe3af95ad..004ede5fb9e427a29fbead7985b14764c90bbc2d 100644 (file)
--- a/src/dns.cc
+++ b/src/dns.cc
@@ -86,11 +86,10 @@ dnsInit(void)
 }
 
 void
-dnsRegisterWithCacheManager(CacheManager & manager)
+dnsRegisterWithCacheManager(void)
 {
-    manager.registerAction("dns",
-                           "Dnsserver Statistics",
-                           dnsStats, 0, 1);
+    CacheManager::GetInstance->
+        registerAction("dns", "Dnsserver Statistics", dnsStats, 0, 1);
 }
 
 void

diff --git a/src/dns_internal.cc b/src/dns_internal.cc
index 7a8f2ea7abd72a5a9c5c4304b8b8e206596c6eef..f5f52aed793feab21b748510bda90704890d214d 100755 (executable)
--- a/src/dns_internal.cc
+++ b/src/dns_internal.cc
@@ -1384,9 +1384,10 @@ idnsInit(void)
 }
 
 void
-idnsRegisterWithCacheManager(CacheManager & manager)
+idnsRegisterWithCacheManager(void)
 {
-    manager.registerAction("idns", "Internal DNS Statistics", idnsStats, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("idns", "Internal DNS Statistics", idnsStats, 0, 1);
 }
 
 void

diff --git a/src/main.cc b/src/main.cc
index d8aeaa5a432c8e260b7bc88ac17e3eafe05a4503..10db943abfa2cc61a3a31322faf49f31f426c6de 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -993,10 +993,10 @@ mainInitialize(void)
 #endif
 #if defined(USE_SELECT) || defined(USE_SELECT_WIN32)
 
-        commSelectRegisterWithCacheManager(*manager);
+        commSelectRegisterWithCacheManager();
 #endif
 
-        clientdbRegisterWithCacheManager(*manager);
+        clientdbRegisterWithCacheManager();
 #if DELAY_POOLS
 
         DelayPools::RegisterWithCacheManager(*manager);
@@ -1005,7 +1005,7 @@ mainInitialize(void)
         DiskIOModule::RegisterAllModulesWithCacheManager();
 #if USE_DNSSERVERS
 
-        dnsRegisterWithCacheManager(*manager);
+        dnsRegisterWithCacheManager();
 #endif
 
         eventInit(*manager);
@@ -1015,7 +1015,7 @@ mainInitialize(void)
         httpHeaderRegisterWithCacheManager(*manager);
 #if !USE_DNSSERVERS
 
-        idnsRegisterWithCacheManager(*manager);
+        idnsRegisterWithCacheManager();
 #endif
 
         ipcacheRegisterWithCacheManager(*manager);

diff --git a/src/protos.h b/src/protos.h
index ceba7c908bfd053a4827636247f48c9d399ba924..a88d9c414b9cf09c90ee7b1d8891cb69485fc931 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -83,7 +83,7 @@ SQUIDCEXTERN void parse_IPAddress_list_token(IPAddress_list **, char *);
 /* client_side.c - FD related client side routines */
 
 SQUIDCEXTERN void clientdbInit(void);
-extern void clientdbRegisterWithCacheManager(CacheManager & manager);
+extern void clientdbRegisterWithCacheManager(void);
 
 SQUIDCEXTERN void clientdbUpdate(const IPAddress &, log_type, protocol_t, size_t);
 
@@ -135,13 +135,13 @@ SQUIDCEXTERN void disk_init(void);
 
 SQUIDCEXTERN void dnsShutdown(void);
 SQUIDCEXTERN void dnsInit(void);
-extern void dnsRegisterWithCacheManager(CacheManager & manager);
+extern void dnsRegisterWithCacheManager(void);
 SQUIDCEXTERN void dnsSubmit(const char *lookup, HLPCB * callback, void *data);
 
 /* dns_internal.c */
 SQUIDCEXTERN void idnsInit(void);
 SQUIDCEXTERN void idnsShutdown(void);
-extern void idnsRegisterWithCacheManager(CacheManager & manager);
+extern void idnsRegisterWithCacheManager(void);
 SQUIDCEXTERN void idnsALookup(const char *, IDNSCB *, void *);
 
 SQUIDCEXTERN void idnsPTRLookup(const IPAddress &, IDNSCB *, void *);