Refactored actions for http_headers, events, external_acl, fqdncache

to Cache Manager singleton API.

diff --git a/src/ExternalACL.h b/src/ExternalACL.h
index d96ef1126c414a3507d61e752b7ae7bcb81a1b66..ac6998e47258b8cf65b8ea1bb7b547ae67245923 100644 (file)
--- a/src/ExternalACL.h
+++ b/src/ExternalACL.h
@@ -92,6 +92,6 @@ protected:
 
 MEMPROXY_CLASS_INLINE(ACLExternal);
 
-extern void externalAclRegisterWithCacheManager(CacheManager & manager);
+extern void externalAclRegisterWithCacheManager(void);
 
 #endif /* SQUID_EXTERNALACL_H */

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index 96bada8eddb7fa3078c2988c0d0913004dddabeb..29f629e16a4d82b6c55ec6f36d4272c1a1ebe223 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -329,12 +329,12 @@ httpHeaderInitModule(void)
 }
 
 void
-httpHeaderRegisterWithCacheManager(CacheManager & manager)
+httpHeaderRegisterWithCacheManager(void)
 {
-    /* register with cache manager */
-    manager.registerAction("http_headers",
-                           "HTTP Header Statistics",
-                           httpHeaderStoreReport, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("http_headers",
+                       "HTTP Header Statistics",
+                       httpHeaderStoreReport, 0, 1);
 }
 
 void

diff --git a/src/HttpHeader.h b/src/HttpHeader.h
index ebb69cc40ce1f6cb0efbbe92bfd6ce5be40ffbf9..29a84a550275188f1760c8ebab563161985cd9f6 100644 (file)
--- a/src/HttpHeader.h
+++ b/src/HttpHeader.h
@@ -269,7 +269,7 @@ private:
 };
 
 
-extern void httpHeaderRegisterWithCacheManager(CacheManager & manager);
+extern void httpHeaderRegisterWithCacheManager(void);
 extern int httpHeaderParseQuotedString (const char *start, String *val);
 SQUIDCEXTERN int httpHeaderHasByNameListMember(const HttpHeader * hdr, const char *name, const char *member, const char separator);
 SQUIDCEXTERN void httpHeaderUpdate(HttpHeader * old, const HttpHeader * fresh, const HttpHeaderMask * denied_mask);

diff --git a/src/event.cc b/src/event.cc
index f23e8d5e0743452af5e16a1c0f327b9aa3e66c39..9b069e619898ba0479b7e3838a18df0de874b628 100644 (file)
--- a/src/event.cc
+++ b/src/event.cc
@@ -149,9 +149,10 @@ eventDelete(EVH * func, void *arg)
 }
 
 void
-eventInit(CacheManager &manager)
+eventInit(void)
 {
-    manager.registerAction("events", "Event Queue", eventDump, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("events", "Event Queue", eventDump, 0, 1);
 }
 
 static void

diff --git a/src/event.h b/src/event.h
index 531c860167ce71ff58a44664141482dc76b16502..36b3952caffbcc61ef356fcf13711323ae7bb89b 100644 (file)
--- a/src/event.h
+++ b/src/event.h
@@ -49,7 +49,7 @@ typedef void EVH(void *);
 extern void eventAdd(const char *name, EVH * func, void *arg, double when, int, bool cbdata=true);
 SQUIDCEXTERN void eventAddIsh(const char *name, EVH * func, void *arg, double delta_ish, int);
 SQUIDCEXTERN void eventDelete(EVH * func, void *arg);
-SQUIDCEXTERN void eventInit(CacheManager &);
+SQUIDCEXTERN void eventInit(void);
 SQUIDCEXTERN void eventFreeMemory(void);
 SQUIDCEXTERN int eventFind(EVH *, void *);
 

diff --git a/src/external_acl.cc b/src/external_acl.cc
index c8f6ea67cc3616a04d3451bebb8504b68eaacc5a..5ae7156ab4c236d9c94d1cfa571988ee5d3b05e3 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1326,11 +1326,12 @@ externalAclInit(void)
 }
 
 void
-externalAclRegisterWithCacheManager(CacheManager & manager)
+externalAclRegisterWithCacheManager(void)
 {
-    manager.registerAction("external_acl",
-                           "External ACL stats",
-                           externalAclStats, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("external_acl",
+                       "External ACL stats",
+                       externalAclStats, 0, 1);
 }
 
 void

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index ea3c13c26b2b8de41633b1d2d32af66f0e27c462..1e55b600491e0607c2c17525f806ee7205b9530d 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -618,11 +618,11 @@ fqdncache_init(void)
 
 /// \ingroup FQDNCacheAPI
 void
-fqdncacheRegisterWithCacheManager(CacheManager & manager)
+fqdncacheRegisterWithCacheManager(void)
 {
-    manager.registerAction("fqdncache",
-                           "FQDN Cache Stats and Contents",
-                           fqdnStats, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("fqdncache", "FQDN Cache Stats and Contents",
+                       fqdnStats, 0, 1);
 
 }
 

diff --git a/src/main.cc b/src/main.cc
index 10db943abfa2cc61a3a31322faf49f31f426c6de..3726b530142356a1e4cccd2ce4ba3995d47a394b 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -1008,11 +1008,11 @@ mainInitialize(void)
         dnsRegisterWithCacheManager();
 #endif
 
-        eventInit(*manager);
-        externalAclRegisterWithCacheManager(*manager);
-        fqdncacheRegisterWithCacheManager(*manager);
+        eventInit();
+        externalAclRegisterWithCacheManager();
+        fqdncacheRegisterWithCacheManager();
         FwdState::RegisterWithCacheManager(*manager);
-        httpHeaderRegisterWithCacheManager(*manager);
+        httpHeaderRegisterWithCacheManager();
 #if !USE_DNSSERVERS
 
         idnsRegisterWithCacheManager();

diff --git a/src/protos.h b/src/protos.h
index a88d9c414b9cf09c90ee7b1d8891cb69485fc931..aee9b661d22b6084ad215851849d43cc7f2f3090 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -167,7 +167,7 @@ SQUIDCEXTERN void fqdncache_nbgethostbyaddr(IPAddress &, FQDNH *, void *);
 
 SQUIDCEXTERN const char *fqdncache_gethostbyaddr(IPAddress &, int flags);
 SQUIDCEXTERN void fqdncache_init(void);
-extern void fqdncacheRegisterWithCacheManager(CacheManager & manager);
+extern void fqdncacheRegisterWithCacheManager(void);
 SQUIDCEXTERN void fqdnStats(StoreEntry *);
 SQUIDCEXTERN void fqdncacheReleaseInvalid(const char *);