More cache manager initialization calls reshuffling.

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 29f629e16a4d82b6c55ec6f36d4272c1a1ebe223..062088c17609a44605d1ede491114bd676154838 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -326,6 +326,8 @@ httpHeaderInitModule(void)
     httpHdrCcInitModule();
 
     httpHdrScInitModule();
+
+    httpHeaderRegisterWithCacheManager();
 }
 
 void

diff --git a/src/Mem.h b/src/Mem.h
index 032c364ad564c520ddf77fbd742a507996d8f9de..ba2d3cc7b779ee05de64776d2e20e42f13c333cb 100644 (file)
--- a/src/Mem.h
+++ b/src/Mem.h
@@ -48,11 +48,13 @@ class Mem
 public:
     static void Init();
     static void Report();
-    static void RegisterWithCacheManager(void);
     static void Stats(StoreEntry *);
     static void CleanIdlePools(void *unused);
     static void Report(std::ostream &);
     static void PoolReport(const MemPoolStats * mp_st, const MemPoolMeter * AllMeter, std::ostream &);
+
+protected:
+    static void RegisterWithCacheManager(void);
 };
 
 #endif /* SQUID_MEM */

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 5ae7156ab4c236d9c94d1cfa571988ee5d3b05e3..0abe12346890e9e1e40c2f27a0147cfcbf5f4ea9 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1323,6 +1323,8 @@ externalAclInit(void)
         firstTimeInit = 0;
         CBDATA_INIT_TYPE_FREECB(externalAclState, free_externalAclState);
     }
+
+    externalAclRegisterWithCacheManager();
 }
 
 void

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index 1e55b600491e0607c2c17525f806ee7205b9530d..6c5b21adda7a0d9075a8ee3b17297b3c29ab9300 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -593,6 +593,8 @@ fqdncache_init(void)
 {
     int n;
 
+    fqdncacheRegisterWithCacheManager();
+
     if (fqdn_table)
         return;
 

diff --git a/src/main.cc b/src/main.cc
index 62d732d2aba8de9a93c89f6b3e24d74daa4e0b81..a1f1a4ce87cd50a61c1b89a33f59ee71053bab1a 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -999,10 +999,10 @@ mainInitialize(void)
 #endif
 
         eventInit();
-        externalAclRegisterWithCacheManager();
-        fqdncacheRegisterWithCacheManager();
+        // externalAclRegisterWithCacheManager(); //moved to externalAclInit()
+        // fqdncacheRegisterWithCacheManager(); //moved to fqdncache_init()
         FwdState::RegisterWithCacheManager();
-        httpHeaderRegisterWithCacheManager();
+        // httpHeaderRegisterWithCacheManager(); //moved to httpHeaderInitModule
 #if !USE_DNSSERVERS
        //TODO: remove cache manager registration functions from namespace
        //      (protos.h and make them static where appropriate)
@@ -1010,7 +1010,7 @@ mainInitialize(void)
 #endif
 
         // ipcacheRegisterWithCacheManager(); //moved to ipcache_init()
-        Mem::RegisterWithCacheManager();
+        // Mem::RegisterWithCacheManager(); //moved to Mem::Init()
         // netdbRegisterWitHCacheManager(); //moved to netdbInit()
         PconnModule::GetInstance()->registerWithCacheManager();
         // redirectRegisterWithCacheManager(); //moved to redirectInit()

diff --git a/src/mem.cc b/src/mem.cc
index 3cc0b59f5358ed7fec6cb67f0f0384efa5a1b5e1..21b748d2799ed02a965c9e3986888fb17fd1db6c 100644 (file)
--- a/src/mem.cc
+++ b/src/mem.cc
@@ -428,6 +428,8 @@ Mem::Init(void)
         if (StrPools[i].pool->objectSize() != StrPoolsAttrs[i].obj_size)
             debugs(13, 1, "Notice: " << StrPoolsAttrs[i].name << " is " << StrPools[i].pool->objectSize() << " bytes instead of requested " << StrPoolsAttrs[i].obj_size << " bytes");
     }
+
+    RegisterWithCacheManager();
 }
 
 void