From: Francesco Chemolli Date: Thu, 10 Jul 2008 17:33:59 +0000 (+0200) Subject: More caller refactoring. X-Git-Tag: SQUID_3_1_0_1~49^2~143^2~26 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8083b1cd184c742855998d39e673a0dfad8c440;p=thirdparty%2Fsquid.git More caller refactoring. --- diff --git a/src/ipcache.cc b/src/ipcache.cc index d849863134..6f2045cf49 100644 --- 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 3726b53014..2d21849167 100644 --- 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 434193d121..b1b8880abd 100644 --- 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 aee9b661d2..2973fb0a21 100644 --- 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 db8e6902d8..ccae37073d 100644 --- 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 13fc7e1af3..ddd3e686dd 100644 --- 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 f1e69478d4..f9b2649142 100644 --- 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 754ab77cba..8185bbad84 100644 --- 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 */