Some more caller refactoring

diff --git a/src/Mem.h b/src/Mem.h
index ec2ae8c91dcbfab7e3a2e8561110d8537e82b9d4..032c364ad564c520ddf77fbd742a507996d8f9de 100644 (file)
--- a/src/Mem.h
+++ b/src/Mem.h
@@ -48,7 +48,7 @@ class Mem
 public:
     static void Init();
     static void Report();
-    static void RegisterWithCacheManager(CacheManager & manager);
+    static void RegisterWithCacheManager(void);
     static void Stats(StoreEntry *);
     static void CleanIdlePools(void *unused);
     static void Report(std::ostream &);

diff --git a/src/forward.cc b/src/forward.cc
index 4daef3197c840991ce4670138668f68d3bb1b1a3..83aabb8d6bfd7c5a9edfb16db251e62c0afffecd 100644 (file)
--- a/src/forward.cc
+++ b/src/forward.cc
@@ -1180,11 +1180,10 @@ FwdState::initModule()
 }
 
 void
-FwdState::RegisterWithCacheManager(CacheManager & manager)
+FwdState::RegisterWithCacheManager(void)
 {
-    manager.registerAction("forward",
-                           "Request Forwarding Statistics",
-                           fwdStats, 0, 1);
+    CacheManager::GetInstance()->
+         registerAction("forward", "Request Forwarding Statistics", fwdStats, 0, 1);
 }
 
 void

diff --git a/src/forward.h b/src/forward.h
index bec382078e27163eb2aa2749d46532255d384828..5124d4ee520039a8020794efd5b7c2d397ab8dbb 100644 (file)
--- a/src/forward.h
+++ b/src/forward.h
@@ -25,7 +25,7 @@ public:
     typedef RefCount<FwdState> Pointer;
     ~FwdState();
     static void initModule();
-    static void RegisterWithCacheManager(CacheManager & manager);
+    static void RegisterWithCacheManager(void);
 
     static void fwdStart(int fd, StoreEntry *, HttpRequest *);
     void startComplete(FwdServer *);

diff --git a/src/main.cc b/src/main.cc
index c638532c8ca7f6951fa1fc07795af5dbaf549691..c6467fca3b6942e8ef1f27a0be481e27c5c76009 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -128,8 +128,6 @@ static void SquidShutdown(void);
 static void mainSetCwd(void);
 static int checkRunningPid(void);
 
-static CacheManager *manager=CacheManager::GetInstance();
-
 #ifndef _SQUID_MSWIN_
 static const char *squid_start_script = "squid_start";
 #endif
@@ -138,6 +136,8 @@ static const char *squid_start_script = "squid_start";
 #include "test_access.c"
 #endif
 
+static CacheManager *manager=CacheManager::GetInstance();
+
 /** temporary thunk across to the unrefactored store interface */
 
 class StoreRootEngine : public AsyncEngine
@@ -1011,7 +1011,7 @@ mainInitialize(void)
         eventInit();
         externalAclRegisterWithCacheManager();
         fqdncacheRegisterWithCacheManager();
-        FwdState::RegisterWithCacheManager(*manager);
+        FwdState::RegisterWithCacheManager();
         httpHeaderRegisterWithCacheManager();
 #if !USE_DNSSERVERS
 
@@ -1019,7 +1019,7 @@ mainInitialize(void)
 #endif
 
         ipcacheRegisterWithCacheManager();
-        Mem::RegisterWithCacheManager(*manager);
+        Mem::RegisterWithCacheManager();
         netdbRegisterWitHCacheManager();
         PconnModule::GetInstance()->registerWithCacheManager();
         redirectRegisterWithCacheManager();

diff --git a/src/mem.cc b/src/mem.cc
index 9f0bce2d3dea6eb3e9c3f7194c1aa806a65dfabb..3cc0b59f5358ed7fec6cb67f0f0384efa5a1b5e1 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -440,10 +440,9 @@ Mem::Report()
 }
 
 void
-Mem::RegisterWithCacheManager(CacheManager & manager)
+Mem::RegisterWithCacheManager(void)
 {
-    manager.registerAction("mem",
-                           "Memory Utilization",
+    CacheManager::GetInstance()->registerAction("mem", "Memory Utilization",
                            Mem::Stats, 0, 1);
 }