From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Wed, 9 Jul 2008 14:28:16 +0000 (+0200)
Subject: Refactored actions for authentication, I/O, storedir and pconn modules to Cache Manager
X-Git-Tag: SQUID_3_1_0_1~49^2~143^2~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=15fab85392bdbac316edecc0511de7ffd60e06a8;p=thirdparty%2Fsquid.git

Refactored actions for authentication, I/O, storedir and pconn modules to Cache Manager
singleton API.
---

diff --git a/src/AuthConfig.cc b/src/AuthConfig.cc
index 0f2e043853..dd250fb027 100644
--- a/src/AuthConfig.cc
+++ b/src/AuthConfig.cc
@@ -77,5 +77,5 @@ AuthConfig::Find(const char *proxy_auth)
 
 /* Default behaviour is to expose nothing */
 void
-AuthConfig::registerWithCacheManager(CacheManager & manager)
+AuthConfig::registerWithCacheManager(void)
 {}
diff --git a/src/AuthConfig.h b/src/AuthConfig.h
index a528ca98e0..6f675e3b37 100644
--- a/src/AuthConfig.h
+++ b/src/AuthConfig.h
@@ -114,7 +114,7 @@ public:
     /** prepare to handle requests */
     virtual void init(AuthConfig *) = 0;
     /** expose any/all statistics to a CacheManager */
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     /** parse config options */
     virtual void parse(AuthConfig *, int, char *) = 0;
     /** the http string id */
diff --git a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
index a0aad76a16..4f1848a278 100644
--- a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
+++ b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.cc
@@ -72,9 +72,9 @@ DiskDaemonDiskIOModule::init()
 }
 
 void
-DiskDaemonDiskIOModule::registerWithCacheManager(CacheManager & manager)
+DiskDaemonDiskIOModule::registerWithCacheManager(void)
 {
-    manager.registerAction("diskd", "DISKD Stats", Stats, 0, 1);
+    CacheManager::GetInstance()->registerAction("diskd", "DISKD Stats", Stats, 0, 1);
 }
 
 void
diff --git a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h
index 233812cd43..a47395ed5a 100644
--- a/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h
+++ b/src/DiskIO/DiskDaemon/DiskDaemonDiskIOModule.h
@@ -43,7 +43,7 @@ public:
     static DiskDaemonDiskIOModule &GetInstance();
     DiskDaemonDiskIOModule();
     virtual void init();
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     virtual void shutdown();
     virtual char const *type () const;
     virtual DiskIOStrategy* createStrategy();
diff --git a/src/DiskIO/DiskIOModule.cc b/src/DiskIO/DiskIOModule.cc
index 866ebbcfd0..71e1c4e3e0 100644
--- a/src/DiskIO/DiskIOModule.cc
+++ b/src/DiskIO/DiskIOModule.cc
@@ -49,10 +49,10 @@ DiskIOModule::DiskIOModule()
 }
 
 void
-DiskIOModule::RegisterAllModulesWithCacheManager(CacheManager & manager)
+DiskIOModule::RegisterAllModulesWithCacheManager(void)
 {
     for (iterator i = GetModules().begin(); i != GetModules().end(); ++i)
-        (*i)->registerWithCacheManager(manager);
+        (*i)->registerWithCacheManager();
 }
 
 void
@@ -132,5 +132,5 @@ DiskIOModule::FindDefault()
 
 /* disk modules dont export anything by default */
 void
-DiskIOModule::registerWithCacheManager(CacheManager & manager)
+DiskIOModule::registerWithCacheManager(void)
 {}
diff --git a/src/DiskIO/DiskIOModule.h b/src/DiskIO/DiskIOModule.h
index fe3837315f..a0b33322f3 100644
--- a/src/DiskIO/DiskIOModule.h
+++ b/src/DiskIO/DiskIOModule.h
@@ -47,7 +47,7 @@ class DiskIOModule
 {
 
 public:
-    static void RegisterAllModulesWithCacheManager(CacheManager & manager);
+    static void RegisterAllModulesWithCacheManager(void);
     static void SetupAllModules();
     static void ModuleAdd(DiskIOModule &);
     static void FreeAllModules();
@@ -63,7 +63,7 @@ public:
     virtual ~DiskIOModule(){}
 
     virtual void init() = 0;
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     virtual void shutdown() = 0;
     virtual DiskIOStrategy *createStrategy() = 0;
 
diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc
index 4fc53ba089..2dff881a02 100644
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.cc
@@ -54,9 +54,9 @@ DiskThreadsDiskIOModule::init()
 }
 
 void
-DiskThreadsDiskIOModule::registerWithCacheManager(CacheManager & manager)
+DiskThreadsDiskIOModule::registerWithCacheManager(void)
 {
-    DiskThreadsIOStrategy::Instance.registerWithCacheManager(manager);
+    DiskThreadsIOStrategy::Instance.registerWithCacheManager();
 }
 
 void
diff --git a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h
index 6386e1a4ae..0435841d73 100644
--- a/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h
+++ b/src/DiskIO/DiskThreads/DiskThreadsDiskIOModule.h
@@ -43,7 +43,7 @@ public:
     static DiskThreadsDiskIOModule &GetInstance();
     DiskThreadsDiskIOModule();
     virtual void init();
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     virtual void shutdown();
     virtual char const *type () const;
     virtual DiskIOStrategy* createStrategy();
diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
index 39343f7fcc..ab1f101b8a 100644
--- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
@@ -61,10 +61,11 @@ DiskThreadsIOStrategy::init(void)
 }
 
 void
-DiskThreadsIOStrategy::registerWithCacheManager(CacheManager & manager)
+DiskThreadsIOStrategy::registerWithCacheManager(void)
 {
-    manager.registerAction("squidaio_counts", "Async IO Function Counters",
-                           aioStats, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("squidaio_counts", "Async IO Function Counters",
+                       aioStats, 0, 1);
 }
 
 void
diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h
index 2526f63881..1ff47da0c9 100644
--- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h
+++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.h
@@ -58,7 +58,7 @@ public:
     virtual int callback();
     virtual void sync();
     virtual void init();
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     void done();
     /* Todo: add access limitations */
     bool initialised;
diff --git a/src/SquidString.h b/src/SquidString.h
index b561bcedff..905a4f607e 100644
--- a/src/SquidString.h
+++ b/src/SquidString.h
@@ -60,7 +60,7 @@ public:
     void add
         (String const *);
 
-    void registerWithCacheManager(CacheManager & manager);
+    void registerWithCacheManager(void);
 
     void remove
         (String const *);
diff --git a/src/StoreFileSystem.cc b/src/StoreFileSystem.cc
index e25e3ff32c..db74d3e992 100644
--- a/src/StoreFileSystem.cc
+++ b/src/StoreFileSystem.cc
@@ -43,7 +43,7 @@ void
 StoreFileSystem::RegisterAllFsWithCacheManager(CacheManager & manager)
 {
     for (iterator i = GetFileSystems().begin(); i != GetFileSystems().end(); ++i)
-        (*i)->registerWithCacheManager(manager);
+        (*i)->registerWithCacheManager();
 }
 
 void
@@ -98,5 +98,5 @@ StoreFileSystem::FreeAllFs()
 
 /* no filesystem is required to export statistics */
 void
-StoreFileSystem::registerWithCacheManager(CacheManager & manager)
+StoreFileSystem::registerWithCacheManager(void)
 {}
diff --git a/src/StoreFileSystem.h b/src/StoreFileSystem.h
index ddd87a0928..c4e532abeb 100644
--- a/src/StoreFileSystem.h
+++ b/src/StoreFileSystem.h
@@ -131,7 +131,7 @@ public:
     virtual char const *type () const = 0;
     virtual SwapDir *createSwapDir() = 0;
     virtual void done() = 0;
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     virtual void setup() = 0;
     // Not implemented
     StoreFileSystem(StoreFileSystem const &);
diff --git a/src/String.cc b/src/String.cc
index dab7b7d16a..102403be7b 100644
--- a/src/String.cc
+++ b/src/String.cc
@@ -254,9 +254,9 @@ ptrcmp(C const &lhs, C const &rhs)
 }
 
 void
-StringRegistry::registerWithCacheManager(CacheManager & manager)
+StringRegistry::registerWithCacheManager(void)
 {
-    manager.registerAction("strings",
+    CacheManager::GetInstance()->registerAction("strings",
                            "Strings in use in squid", Stat, 0, 1);
 }
 
diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index 60c773a843..3a693635f8 100644
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -622,9 +622,10 @@ AuthBasicConfig::init(AuthConfig * scheme)
 }
 
 void
-AuthBasicConfig::registerWithCacheManager(CacheManager & manager)
+AuthBasicConfig::registerWithCacheManager(void)
 {
-    manager.registerAction("basicauthenticator",
+    CacheManager::GetInstance()->
+            registerAction("basicauthenticator",
                            "Basic User Authenticator Stats",
                            authenticateBasicStats, 0, 1);
 }
diff --git a/src/auth/basic/auth_basic.h b/src/auth/basic/auth_basic.h
index c1d335d24d..22c13c580e 100644
--- a/src/auth/basic/auth_basic.h
+++ b/src/auth/basic/auth_basic.h
@@ -124,7 +124,7 @@ public:
     virtual void fixHeader(AuthUserRequest *, HttpReply *, http_hdr_type, HttpRequest *);
     virtual void init(AuthConfig *);
     virtual void parse(AuthConfig *, int, char *);
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     virtual const char * type() const;
     int authenticateChildren;
     int authenticateConcurrency;
diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 32f6dbe25f..bbecfda780 100644
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -888,9 +888,10 @@ AuthDigestConfig::init(AuthConfig * scheme)
 }
 
 void
-AuthDigestConfig::registerWithCacheManager(CacheManager & manager)
+AuthDigestConfig::registerWithCacheManager(void)
 {
-    manager.registerAction("digestauthenticator",
+    CacheManager::GetInstance()->
+            registerAction("digestauthenticator",
                            "Digest User Authenticator Stats",
                            authenticateDigestStats, 0, 1);
 }
diff --git a/src/auth/digest/auth_digest.h b/src/auth/digest/auth_digest.h
index 73b05086f2..90d029973a 100644
--- a/src/auth/digest/auth_digest.h
+++ b/src/auth/digest/auth_digest.h
@@ -153,7 +153,7 @@ public:
     virtual void fixHeader(AuthUserRequest *, HttpReply *, http_hdr_type, HttpRequest *);
     virtual void init(AuthConfig *);
     virtual void parse(AuthConfig *, int, char *);
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     virtual const char * type() const;
     int authenticateChildren;
     char *digestAuthRealm;
diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index c85842cd42..36ff22f34b 100644
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -212,9 +212,10 @@ AuthNegotiateConfig::init(AuthConfig * scheme)
 }
 
 void
-AuthNegotiateConfig::registerWithCacheManager(CacheManager & manager)
+AuthNegotiateConfig::registerWithCacheManager(void)
 {
-    manager.registerAction("negotiateauthenticator",
+    CacheManager::GetInstance()->
+            registerAction("negotiateauthenticator",
                            "Negotiate User Authenticator Stats",
                            authenticateNegotiateStats, 0, 1);
 }
diff --git a/src/auth/negotiate/auth_negotiate.h b/src/auth/negotiate/auth_negotiate.h
index a9bc53d616..e46604afa6 100644
--- a/src/auth/negotiate/auth_negotiate.h
+++ b/src/auth/negotiate/auth_negotiate.h
@@ -125,7 +125,7 @@ public:
     virtual void fixHeader(AuthUserRequest *, HttpReply *, http_hdr_type, HttpRequest *);
     virtual void init(AuthConfig *);
     virtual void parse(AuthConfig *, int, char *);
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     virtual const char * type() const;
     int authenticateChildren;
     int keep_alive;
diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index c9956f2ddd..edeb966d0d 100644
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -198,9 +198,10 @@ AuthNTLMConfig::init(AuthConfig * scheme)
 }
 
 void
-AuthNTLMConfig::registerWithCacheManager(CacheManager & manager)
+AuthNTLMConfig::registerWithCacheManager(void)
 {
-    manager.registerAction("ntlmauthenticator",
+    CacheManager::GetInstance()->
+            registerAction("ntlmauthenticator",
                            "NTLM User Authenticator Stats",
                            authenticateNTLMStats, 0, 1);
 }
diff --git a/src/auth/ntlm/auth_ntlm.h b/src/auth/ntlm/auth_ntlm.h
index 38351a7752..cb76a9c214 100644
--- a/src/auth/ntlm/auth_ntlm.h
+++ b/src/auth/ntlm/auth_ntlm.h
@@ -110,7 +110,7 @@ public:
     virtual void fixHeader(AuthUserRequest *, HttpReply *, http_hdr_type, HttpRequest *);
     virtual void init(AuthConfig *);
     virtual void parse(AuthConfig *, int, char *);
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     virtual const char * type() const;
     int authenticateChildren;
     int keep_alive;
diff --git a/src/authenticate.cc b/src/authenticate.cc
index 6285e4626a..394ba765a9 100644
--- a/src/authenticate.cc
+++ b/src/authenticate.cc
@@ -90,11 +90,11 @@ authenticateInit(authConfig * config)
 }
 
 void
-authenticateRegisterWithCacheManager(authConfig * config, CacheManager & manager)
+authenticateRegisterWithCacheManager(authConfig * config)
 {
     for (authConfig::iterator i = config->begin(); i != config->end(); ++i) {
         AuthConfig *scheme = *i;
-        scheme->registerWithCacheManager(manager);
+        scheme->registerWithCacheManager();
     }
 }
 
diff --git a/src/authenticate.h b/src/authenticate.h
index 8b0dd00b38..6bf8fc9107 100644
--- a/src/authenticate.h
+++ b/src/authenticate.h
@@ -83,7 +83,7 @@ extern void authenticateAuthUserMerge(AuthUser *, AuthUser *);
 /// \ingroup AuthAPI
 extern void authenticateInit(authConfig *);
 /// \ingroup AuthAPI
-extern void authenticateRegisterWithCacheManager(authConfig * config, CacheManager & manager);
+extern void authenticateRegisterWithCacheManager(authConfig * config);
 /// \ingroup AuthAPI
 extern void authenticateShutdown(void);
 /// \ingroup AuthAPI
diff --git a/src/fs/coss/StoreFScoss.cc b/src/fs/coss/StoreFScoss.cc
index 74c1b5485b..6028eb1b03 100644
--- a/src/fs/coss/StoreFScoss.cc
+++ b/src/fs/coss/StoreFScoss.cc
@@ -84,9 +84,9 @@ StoreFScoss::setup()
 }
 
 void
-StoreFScoss::registerWithCacheManager(CacheManager & manager)
+StoreFScoss::registerWithCacheManager()
 {
-    manager.registerAction("coss", "COSS Stats", Stats, 0, 1);
+    CacheManager::GetInstance()->registerAction("coss", "COSS Stats", Stats, 0, 1);
 }
 
 void
diff --git a/src/fs/coss/StoreFScoss.h b/src/fs/coss/StoreFScoss.h
index 2cbd335d86..69ac6dd988 100644
--- a/src/fs/coss/StoreFScoss.h
+++ b/src/fs/coss/StoreFScoss.h
@@ -86,7 +86,7 @@ public:
     virtual char const *type() const;
     virtual SwapDir *createSwapDir();
     virtual void done();
-    virtual void registerWithCacheManager(CacheManager & manager);
+    virtual void registerWithCacheManager(void);
     virtual void setup();
     /* Not implemented */
     StoreFScoss (StoreFScoss const &);
diff --git a/src/main.cc b/src/main.cc
index e53e989490..d2b78e9abb 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -969,7 +969,7 @@ mainInitialize(void)
         /* register the modules in the cache manager menus */
         accessLogRegisterWithCacheManager();
         asnRegisterWithCacheManager();
-        authenticateRegisterWithCacheManager(&Config.authConfiguration, *manager);
+        authenticateRegisterWithCacheManager(&Config.authConfiguration);
 #if USE_CARP
 
         carpRegisterWithCacheManager(*manager);
@@ -1002,7 +1002,7 @@ mainInitialize(void)
         DelayPools::RegisterWithCacheManager(*manager);
 #endif
 
-        DiskIOModule::RegisterAllModulesWithCacheManager(*manager);
+        DiskIOModule::RegisterAllModulesWithCacheManager();
 #if USE_DNSSERVERS
 
         dnsRegisterWithCacheManager(*manager);
@@ -1021,7 +1021,7 @@ mainInitialize(void)
         ipcacheRegisterWithCacheManager(*manager);
         Mem::RegisterWithCacheManager(*manager);
         netdbRegisterWitHCacheManager(*manager);
-        PconnModule::GetInstance()->registerWithCacheManager(*manager);
+        PconnModule::GetInstance()->registerWithCacheManager();
         redirectRegisterWithCacheManager(*manager);
         refreshRegisterWithCacheManager(*manager);
         statRegisterWithCacheManager(*manager);
@@ -1031,7 +1031,7 @@ mainInitialize(void)
         storeLogRegisterWithCacheManager(*manager);
 #if DEBUGSTRINGS
 
-        StringRegistry::Instance().registerWithCacheManager(*manager);
+        StringRegistry::Instance().registerWithCacheManager();
 #endif
 
 #if	USE_XPROF_STATS
diff --git a/src/pconn.cc b/src/pconn.cc
index 229657da81..8895a0a697 100644
--- a/src/pconn.cc
+++ b/src/pconn.cc
@@ -340,11 +340,12 @@ PconnModule::GetInstance()
 }
 
 void
-PconnModule::registerWithCacheManager(CacheManager & manager)
+PconnModule::registerWithCacheManager(void)
 {
-    manager.registerAction("pconn",
-                           "Persistent Connection Utilization Histograms",
-                           DumpWrapper, 0, 1);
+    CacheManager::GetInstance()->
+        registerAction("pconn",
+                       "Persistent Connection Utilization Histograms",
+                       DumpWrapper, 0, 1);
 }
 
 void
diff --git a/src/pconn.h b/src/pconn.h
index 1991ef1562..5e612c5502 100644
--- a/src/pconn.h
+++ b/src/pconn.h
@@ -107,7 +107,7 @@ public:
     static void DumpWrapper(StoreEntry *e);
 
     PconnModule();
-    void registerWithCacheManager(CacheManager & manager);
+    void registerWithCacheManager(void);
 
     void add(PconnPool *);