More caller refactoring.

diff --git a/src/ipcache.cc b/src/ipcache.cc
index d8498631343dceb8a03a259f44ec0c90f671f768..6f2045cf4999ddb97062dcf894050bc313f7aa42 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -810,11 +810,12 @@ ipcache_init(void)
 
 /// \ingroup IPCacheAPI
 void
-ipcacheRegisterWithCacheManager(CacheManager & manager)
+ipcacheRegisterWithCacheManager(void)
 {
-    manager.registerAction("ipcache",
-                           "IP Cache Stats and Contents",
-                           stat_ipcache_get, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("ipcache",
+                       "IP Cache Stats and Contents",
+                       stat_ipcache_get, 0, 1);
 }
 
 /**

diff --git a/src/main.cc b/src/main.cc
index 3726b530142356a1e4cccd2ce4ba3995d47a394b..2d218491674d993bde87a71962d775aaf825395c 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1018,14 +1018,14 @@ mainInitialize(void)
         idnsRegisterWithCacheManager();
 #endif
 
-        ipcacheRegisterWithCacheManager(*manager);
+        ipcacheRegisterWithCacheManager();
         Mem::RegisterWithCacheManager(*manager);
-        netdbRegisterWitHCacheManager(*manager);
+        netdbRegisterWitHCacheManager();
         PconnModule::GetInstance()->registerWithCacheManager();
-        redirectRegisterWithCacheManager(*manager);
-        refreshRegisterWithCacheManager(*manager);
-        statRegisterWithCacheManager(*manager);
-        storeDigestRegisterWithCacheManager(*manager);
+        redirectRegisterWithCacheManager();
+        refreshRegisterWithCacheManager();
+        statRegisterWithCacheManager();
+        storeDigestRegisterWithCacheManager();
         StoreFileSystem::RegisterAllFsWithCacheManager(*manager);
         storeRegisterWithCacheManager(*manager);
         storeLogRegisterWithCacheManager(*manager);

diff --git a/src/net_db.cc b/src/net_db.cc
index 434193d121104fa67a73c13cc3a8ec8d66ecb782..b1b8880abd3efc879615685a98b93696df71795d 100644 (file)
--- a/src/net_db.cc
+++ b/src/net_db.cc
@@ -913,7 +913,7 @@ netdbInit(void)
 }
 
 void
-netdbRegisterWitHCacheManager(CacheManager & manager)
+netdbRegisterWitHCacheManager(void)
 {
 #if USE_ICMP
     manager.registerAction("netdb",

diff --git a/src/protos.h b/src/protos.h
index aee9b661d22b6084ad215851849d43cc7f2f3090..2973fb0a2105d3c2b59232da0f94b2b2d60c5bf9 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -342,7 +342,7 @@ SQUIDCEXTERN const ipcache_addrs *ipcache_gethostbyname(const char *, int flags)
 SQUIDCEXTERN void ipcacheInvalidate(const char *);
 SQUIDCEXTERN void ipcacheInvalidateNegative(const char *);
 SQUIDCEXTERN void ipcache_init(void);
-extern void ipcacheRegisterWithCacheManager(CacheManager & manager);
+extern void ipcacheRegisterWithCacheManager(void);
 SQUIDCEXTERN void stat_ipcache_get(StoreEntry *);
 SQUIDCEXTERN void ipcacheCycleAddr(const char *name, ipcache_addrs *);
 
@@ -415,7 +415,7 @@ SQUIDCEXTERN int peerHTTPOkay(const peer *, HttpRequest *);
 SQUIDCEXTERN peer *whichPeer(const IPAddress &from);
 
 SQUIDCEXTERN void netdbInit(void);
-extern void netdbRegisterWitHCacheManager(CacheManager & manager);
+extern void netdbRegisterWitHCacheManager(void);
 
 SQUIDCEXTERN void netdbHandlePingReply(const IPAddress &from, int hops, int rtt);
 SQUIDCEXTERN void netdbPingSite(const char *hostname);
@@ -453,7 +453,7 @@ unsigned long getOutgoingTOS(HttpRequest * request);
 SQUIDCEXTERN void urnStart(HttpRequest *, StoreEntry *);
 
 SQUIDCEXTERN void redirectInit(void);
-extern void redirectRegisterWithCacheManager(CacheManager & manager);
+extern void redirectRegisterWithCacheManager(void);
 SQUIDCEXTERN void redirectShutdown(void);
 
 extern void refreshAddToList(const char *, int, time_t, int, time_t);
@@ -464,7 +464,7 @@ extern int refreshCheckHTCP(const StoreEntry *, HttpRequest *);
 extern int refreshCheckDigest(const StoreEntry *, time_t delta);
 extern time_t getMaxAge(const char *url);
 extern void refreshInit(void);
-extern void refreshRegisterWithCacheManager(CacheManager & manager);
+extern void refreshRegisterWithCacheManager(void);
 extern const refresh_t *refreshLimits(const char *url);
 
 extern void serverConnectionsClose(void);
@@ -477,7 +477,7 @@ extern void start_announce(void *unused);
 extern void waisStart(FwdState *);
 
 SQUIDCEXTERN void statInit(void);
-extern void statRegisterWithCacheManager(CacheManager & manager);
+extern void statRegisterWithCacheManager(void);
 SQUIDCEXTERN void statFreeMemory(void);
 SQUIDCEXTERN double median_svc_get(int, int);
 SQUIDCEXTERN void pconnHistCount(int, int);
@@ -563,7 +563,7 @@ SQUIDCEXTERN HASHCMP storeKeyHashCmp;
  * store_digest.c
  */
 SQUIDCEXTERN void storeDigestInit(void);
-extern void storeDigestRegisterWithCacheManager(CacheManager & manager);
+extern void storeDigestRegisterWithCacheManager(void);
 SQUIDCEXTERN void storeDigestNoteStoreReady(void);
 SQUIDCEXTERN void storeDigestScheduleRebuild(void);
 SQUIDCEXTERN void storeDigestDel(const StoreEntry * entry);

diff --git a/src/redirect.cc b/src/redirect.cc
index db8e6902d88c34d1cf0e65a0f134ef1d4ae85476..ccae37073d99980ef121ac6a4ebcd4ff280abcdb 100644 (file)
--- a/src/redirect.cc
+++ b/src/redirect.cc
@@ -204,11 +204,10 @@ redirectInit(void)
 }
 
 void
-redirectRegisterWithCacheManager(CacheManager & manager)
+redirectRegisterWithCacheManager(void)
 {
-    manager.registerAction("redirector",
-                           "URL Redirector Stats",
-                           redirectStats, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("redirector", "URL Redirector Stats", redirectStats, 0, 1);
 }
 
 void

diff --git a/src/refresh.cc b/src/refresh.cc
index 13fc7e1af3c4e28daa4688c9b8e6a5fa374ca1ba..ddd3e686dda04773b86e6a1780ff050b59a0a22b 100644 (file)
--- a/src/refresh.cc
+++ b/src/refresh.cc
@@ -599,11 +599,8 @@ refreshInit(void)
 }
 
 void
-refreshRegisterWithCacheManager(CacheManager & manager)
+refreshRegisterWithCacheManager(void)
 {
-    manager.registerAction("refresh",
-                           "Refresh Algorithm Statistics",
-                           refreshStats,
-                           0,
-                           1);
+    CacheManager::GetInstance()->
+        registerAction("refresh", "Refresh Algorithm Statistics", refreshStats, 0, 1);
 }

diff --git a/src/stat.cc b/src/stat.cc
index f1e69478d48417ffbd93ddeb4f5f37eb53860d12..f9b2649142e86c91bfd249c97222ea37698d94c7 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1029,79 +1029,45 @@ statInit(void)
 }
 
 void
-statRegisterWithCacheManager(CacheManager & manager)
+statRegisterWithCacheManager(void)
 {
-    manager.registerAction("info",
-                           "General Runtime Information",
-                           info_get, 0, 1);
-
-    manager.registerAction("service_times",
-                           "Service Times (Percentiles)",
+    CacheManager *manager = CacheManager::GetInstance();
+    manager->registerAction("info", "General Runtime Information",
+                            info_get, 0, 1);
+    manager->registerAction("service_times", "Service Times (Percentiles)",
                            service_times, 0, 1);
-
-    manager.registerAction("filedescriptors",
-                           "Process Filedescriptor Allocation",
+    manager->registerAction("filedescriptors", "Process Filedescriptor Allocation",
                            fde::DumpStats, 0, 1);
-
-    manager.registerAction("objects",
-                           "All Cache Objects",
-                           stat_objects_get, 0, 0);
-
-    manager.registerAction("vm_objects",
-                           "In-Memory and In-Transit Objects",
+    manager->registerAction("objects", "All Cache Objects", stat_objects_get, 0, 0);
+    manager->registerAction("vm_objects", "In-Memory and In-Transit Objects",
                            stat_vmobjects_get, 0, 0);
-
-#if DEBUG_OPENFD
-
-    manager.registerAction("openfd_objects",
-                           "Objects with Swapout files open",
-                           statOpenfdObj, 0, 0);
-
-#endif
-
-    manager.registerAction("io",
-                           "Server-side network read() size histograms",
+    manager->registerAction("io", "Server-side network read() size histograms",
                            stat_io_get, 0, 1);
-
-    manager.registerAction("counters",
-                           "Traffic and Resource Counters",
+    manager->registerAction("counters", "Traffic and Resource Counters",
                            statCountersDump, 0, 1);
-
-    manager.registerAction("peer_select",
-                           "Peer Selection Algorithms",
+    manager->registerAction("peer_select", "Peer Selection Algorithms",
                            statPeerSelect, 0, 1);
-
-    manager.registerAction("digest_stats",
-                           "Cache Digest and ICP blob",
+    manager->registerAction("digest_stats", "Cache Digest and ICP blob",
                            statDigestBlob, 0, 1);
-
-    manager.registerAction("5min",
-                           "5 Minute Average of Counters",
+    manager->registerAction("5min", "5 Minute Average of Counters",
                            statAvg5min, 0, 1);
-
-    manager.registerAction("60min",
-                           "60 Minute Average of Counters",
+    manager->registerAction("60min", "60 Minute Average of Counters",
                            statAvg60min, 0, 1);
-
-    manager.registerAction("utilization",
-                           "Cache Utilization",
+    manager->registerAction("utilization", "Cache Utilization",
                            statUtilization, 0, 1);
-
-#if STAT_GRAPHS
-
-    manager.registerAction("graph_variables",
-                           "Display cache metrics graphically",
-                           statGraphDump, 0, 1);
-
-#endif
-
-    manager.registerAction("histograms",
-                           "Full Histogram Counts",
+    manager->registerAction("histograms", "Full Histogram Counts",
                            statCountersHistograms, 0, 1);
-
-    manager.registerAction("active_requests",
+    manager->registerAction("active_requests",
                            "Client-side Active Requests",
                            statClientRequests, 0, 1);
+#if DEBUG_OPENFD
+    manager->registerAction("openfd_objects", "Objects with Swapout files open",
+                           statOpenfdObj, 0, 0);
+#endif
+#if STAT_GRAPHS
+    manager->registerAction("graph_variables", "Display cache metrics graphically",
+                           statGraphDump, 0, 1);
+#endif
 }
 
 static void

diff --git a/src/store_digest.cc b/src/store_digest.cc
index 754ab77cba98df0b16afb2f285c3eca50063db85..8185bbad84602e4942272e71152eda429918134a 100644 (file)
--- a/src/store_digest.cc
+++ b/src/store_digest.cc
@@ -131,10 +131,10 @@ storeDigestInit(void)
 }
 
 void
-storeDigestRegisterWithCacheManager(CacheManager & manager)
+storeDigestRegisterWithCacheManager(void)
 {
-    manager.registerAction("store_digest", "Store Digest",
-                           storeDigestReport, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("store_digest", "Store Digest", storeDigestReport, 0, 1);
 }
 
 /* called when store_rebuild completes */