Refactored actions for cbdata to Cache Manager singleton API.

diff --git a/src/cbdata.cc b/src/cbdata.cc
index 3ff8bd94af0a446af123b8c9e4477ef4faa3e7d0..ddd64679850c8fc16a6e13ac6fc001548d616c12 100644 (file)
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -271,16 +271,17 @@ cbdataInternalAddType(cbdata_type type, const char *name, int size, FREE * free_
 }
 
 void
-cbdataRegisterWithCacheManager(CacheManager & manager)
+cbdataRegisterWithCacheManager()
 {
-    manager.registerAction("cbdata",
-                           "Callback Data Registry Contents",
-                           cbdataDump, 0, 1);
+    CacheManager *manager=CacheManager::GetInstance();
+    manager->registerAction("cbdata",
+                            "Callback Data Registry Contents",
+                            cbdataDump, 0, 1);
 #if CBDATA_DEBUG
 
-    manager.registerAction("cbdatahistory",
-                           "Detailed call history for all current cbdata contents",
-                           cbdataDumpHistory, 0, 1);
+    manager->registerAction("cbdatahistory",
+                            "Detailed call history for all current cbdata contents",
+                            cbdataDumpHistory, 0, 1);
 #endif
 }
 

diff --git a/src/cbdata.h b/src/cbdata.h
index e75814356064a1db3433040f32c6f24e6ca64bbb..5e4e9b3cabbfca5589abab6c10e2204e07dd7616 100644 (file)
--- a/src/cbdata.h
+++ b/src/cbdata.h
@@ -236,7 +236,7 @@ typedef enum {
 } cbdata_type;
 
 /// \ingroup CBDATAAPI
-extern void cbdataRegisterWithCacheManager(CacheManager & manager);
+extern void cbdataRegisterWithCacheManager();
 
 #if CBDATA_DEBUG
 extern void *cbdataInternalAllocDbg(cbdata_type type, const char *, int);

diff --git a/src/main.cc b/src/main.cc
index 72947fa6fb96a5b81f6de2c0b8a9f210fc844d83..921a036031e3b4a40603995744cbf896c8e76c5c 100644 (file)
--- a/src/main.cc
+++ b/src/main.cc
@@ -975,7 +975,7 @@ mainInitialize(void)
         carpRegisterWithCacheManager();
 #endif
 
-        cbdataRegisterWithCacheManager(*manager);
+        cbdataRegisterWithCacheManager();
         /* These use separate calls so that the comm loops can eventually
          * coexist.
          */