SourceFormat Enforcement

diff --git a/doc/debug-sections.txt b/doc/debug-sections.txt
index 70254fdb0529e6290ec32390a3afc91cc1df37a6..1289116ac050c45b3dce0914cb4ae45efaa100ed 100644 (file)
--- a/doc/debug-sections.txt
+++ b/doc/debug-sections.txt
@@ -30,6 +30,7 @@ section 13    High Level Memory Pool Management
 section 14    IP Cache
 section 14    IP Storage and Handling
 section 15    Neighbor Routines
+section 16    Cache Manager API
 section 16    Cache Manager Objects
 section 17    Request Forwarding
 section 18    Cache Manager Statistics

diff --git a/src/CacheManager.h b/src/CacheManager.h
index 77c0359a7220c5abe64cd34aa30d3771236f0468..2b3a955ce03e834d8413c14276de3f058b2b7843 100644 (file)
--- a/src/CacheManager.h
+++ b/src/CacheManager.h
@@ -62,11 +62,11 @@ public:
     typedef std::vector<Mgr::ActionProfilePointer> Menu;
 
     void registerProfile(char const * action, char const * desc,
-        OBJH * handler,
-        int pw_req_flag, int atomic);
+                         OBJH * handler,
+                         int pw_req_flag, int atomic);
     void registerProfile(char const * action, char const * desc,
-        Mgr::ClassActionCreationHandler *handler,
-        int pw_req_flag, int atomic);
+                         Mgr::ClassActionCreationHandler *handler,
+                         int pw_req_flag, int atomic);
     Mgr::ActionProfilePointer findAction(char const * action) const;
     Mgr::Action::Pointer createNamedAction(const char *actionName);
     Mgr::Action::Pointer createRequestedAction(const Mgr::ActionParams &);

diff --git a/src/DiskIO/DiskDaemon/DiskdAction.cc b/src/DiskIO/DiskDaemon/DiskdAction.cc
index 2e44af164ce188853f4e95f7b91a28583b1b422d..95743e10df65b103707637a541a8fec251a02184 100644 (file)
--- a/src/DiskIO/DiskDaemon/DiskdAction.cc
+++ b/src/DiskIO/DiskDaemon/DiskdAction.cc
@@ -61,7 +61,7 @@ DiskdAction::Create(const Mgr::CommandPointer &aCmd)
 }
 
 DiskdAction::DiskdAction(const Mgr::CommandPointer &aCmd):
-    Action(aCmd), data()
+        Action(aCmd), data()
 {
     debugs(79, 5, HERE);
 }

diff --git a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
index 68461f5cb6668fe1cae343469b52dbede0c704a2..e7c0fd9a428be2f46121b80f704172c238f734bb 100644 (file)
--- a/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
+++ b/src/DiskIO/DiskThreads/DiskThreadsIOStrategy.cc
@@ -67,7 +67,7 @@ void
 DiskThreadsIOStrategy::registerWithCacheManager(void)
 {
     Mgr::RegisterAction("squidaio_counts", "Async IO Function Counters",
-                   aioStats, 0, 1);
+                        aioStats, 0, 1);
 }
 
 void

diff --git a/src/HttpHeader.cc b/src/HttpHeader.cc
index e191b56e6bdf0b85e3e392eefcd5d0e5098a02d8..f26d380e616e70a80e5bc84343b79d10104e7831 100644 (file)
--- a/src/HttpHeader.cc
+++ b/src/HttpHeader.cc
@@ -284,8 +284,8 @@ static void
 httpHeaderRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("http_headers",
-                   "HTTP Header Statistics",
-                   httpHeaderStoreReport, 0, 1);
+                        "HTTP Header Statistics",
+                        httpHeaderStoreReport, 0, 1);
 }
 
 void

diff --git a/src/StoreIOBuffer.h b/src/StoreIOBuffer.h
index db1cb4064db5a70b24a7ec1607d9fe8191377019..eb08cce431f3708787e54903500267e367038d87 100644 (file)
--- a/src/StoreIOBuffer.h
+++ b/src/StoreIOBuffer.h
@@ -81,7 +81,7 @@ std::ostream &
 operator <<(std::ostream &os, const StoreIOBuffer &b)
 {
     return os << "ioBuf(@" << b.offset << ", len=" << b.length << ", " <<
-        (void*)b.data << (b.flags.error ? ", ERR" : "") << ')';
+           (void*)b.data << (b.flags.error ? ", ERR" : "") << ')';
 }
 
 #endif /* SQUID_STOREIOBUFFER_H */

diff --git a/src/String.cc b/src/String.cc
index fa13917c6d3c517facad6d99fb557031f0f68c0f..c86696a86f3a941981eb08239f8a297335efa163 100644 (file)
--- a/src/String.cc
+++ b/src/String.cc
@@ -282,7 +282,7 @@ StringRegistry::StringRegistry()
 {
 #if DEBUGSTRINGS
     Mgr::RegisterAction("strings",
-            "Strings in use in squid", Stat, 0, 1);
+                        "Strings in use in squid", Stat, 0, 1);
 #endif
 }
 

diff --git a/src/auth/basic/auth_basic.cc b/src/auth/basic/auth_basic.cc
index 29271940c7f896bf0932a523a868c105d471515a..1c40a97844651f45a5f8cb5dd9ce437b210468d3 100644 (file)
--- a/src/auth/basic/auth_basic.cc
+++ b/src/auth/basic/auth_basic.cc
@@ -545,8 +545,8 @@ void
 AuthBasicConfig::registerWithCacheManager(void)
 {
     Mgr::RegisterAction("basicauthenticator",
-                   "Basic User Authenticator Stats",
-                   authenticateBasicStats, 0, 1);
+                        "Basic User Authenticator Stats",
+                        authenticateBasicStats, 0, 1);
 }
 
 void

diff --git a/src/auth/digest/auth_digest.cc b/src/auth/digest/auth_digest.cc
index 8ff9b8025820e12e217bd918f9c9e4f54568f96c..4da2f632fb147876313f1c91cfee77781d3e66c7 100644 (file)
--- a/src/auth/digest/auth_digest.cc
+++ b/src/auth/digest/auth_digest.cc
@@ -674,8 +674,8 @@ void
 AuthDigestConfig::registerWithCacheManager(void)
 {
     Mgr::RegisterAction("digestauthenticator",
-                   "Digest User Authenticator Stats",
-                   authenticateDigestStats, 0, 1);
+                        "Digest User Authenticator Stats",
+                        authenticateDigestStats, 0, 1);
 }
 
 /* free any allocated configuration details */

diff --git a/src/auth/negotiate/auth_negotiate.cc b/src/auth/negotiate/auth_negotiate.cc
index 5fba97f60f5041c4292bada7c8701f574051ddbc..73a2b15c8e22a690819ed0cd93ce0ac722a72891 100644 (file)
--- a/src/auth/negotiate/auth_negotiate.cc
+++ b/src/auth/negotiate/auth_negotiate.cc
@@ -201,8 +201,8 @@ void
 AuthNegotiateConfig::registerWithCacheManager(void)
 {
     Mgr::RegisterAction("negotiateauthenticator",
-                   "Negotiate User Authenticator Stats",
-                   authenticateNegotiateStats, 0, 1);
+                        "Negotiate User Authenticator Stats",
+                        authenticateNegotiateStats, 0, 1);
 }
 
 bool

diff --git a/src/auth/ntlm/auth_ntlm.cc b/src/auth/ntlm/auth_ntlm.cc
index d2c1802554b7ede242b2bda62b6f4e3f635cad06..18f63bffe8b8efb178f95bed8d9d08f7931b570e 100644 (file)
--- a/src/auth/ntlm/auth_ntlm.cc
+++ b/src/auth/ntlm/auth_ntlm.cc
@@ -187,8 +187,8 @@ void
 AuthNTLMConfig::registerWithCacheManager(void)
 {
     Mgr::RegisterAction("ntlmauthenticator",
-                   "NTLM User Authenticator Stats",
-                   authenticateNTLMStats, 0, 1);
+                        "NTLM User Authenticator Stats",
+                        authenticateNTLMStats, 0, 1);
 }
 
 bool

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index b7eb47addc51205090eace3c5e334f8a3944dfa7..d5db4bd869f2cea80a88ffa9a535825d94f5c814 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -564,9 +564,9 @@ parseConfigFile(const char *file_name)
 
     if (opt_send_signal == -1) {
         Mgr::RegisterAction("config",
-                                "Current Squid Configuration",
-                                dump_config,
-                                1, 1);
+                            "Current Squid Configuration",
+                            dump_config,
+                            1, 1);
     }
 
     return err_count;

diff --git a/src/cache_manager.cc b/src/cache_manager.cc
index b95f30b7a8bb5f3a1443270affb7b37145eb7efd..07fa4081891f3158d216d5049bda0a60fdaa25b5 100644 (file)
--- a/src/cache_manager.cc
+++ b/src/cache_manager.cc
@@ -67,8 +67,7 @@ public:
 public:
     ClassActionCreator(Handler *aHandler): handler(aHandler) {}
 
-    virtual Mgr::Action::Pointer create(const Mgr::Command::Pointer &cmd) const
-    {
+    virtual Mgr::Action::Pointer create(const Mgr::Command::Pointer &cmd) const {
         return handler(cmd);
     }
 
@@ -101,17 +100,17 @@ CacheManager::registerProfile(char const * action, char const * desc, OBJH * han
 {
     debugs(16, 3, HERE << "registering legacy " << action);
     const Mgr::ActionProfile::Pointer profile = new Mgr::ActionProfile(action,
-        desc, pw_req_flag, atomic, new Mgr::FunActionCreator(handler));
+            desc, pw_req_flag, atomic, new Mgr::FunActionCreator(handler));
     registerProfile(profile);
 }
 
 void
 CacheManager::registerProfile(char const * action, char const * desc,
-                             ClassActionCreator::Handler *handler,
-                             int pw_req_flag, int atomic)
+                              ClassActionCreator::Handler *handler,
+                              int pw_req_flag, int atomic)
 {
     const Mgr::ActionProfile::Pointer profile = new Mgr::ActionProfile(action,
-        desc, pw_req_flag, atomic, new ClassActionCreator(handler));
+            desc, pw_req_flag, atomic, new ClassActionCreator(handler));
     registerProfile(profile);
 }
 
@@ -245,7 +244,7 @@ CacheManager::ParseHeaders(const HttpRequest * request, Mgr::ActionParams &param
 
     /* warning: this prints decoded password which maybe not what you want to do @?@ @?@ */
     debugs(16, 9, "CacheManager::ParseHeaders: got user: '" <<
-        params.userName << "' passwd: '" << params.password << "'");
+           params.userName << "' passwd: '" << params.password << "'");
 }
 
 /**
@@ -310,7 +309,7 @@ CacheManager::Start(int fd, HttpRequest * request, StoreEntry * entry)
     ParseHeaders(request, cmd->params);
 
     const char *userName = cmd->params.userName.size() ?
-        cmd->params.userName.termedBuf() : "unknown";
+                           cmd->params.userName.termedBuf() : "unknown";
 
     /* Check password */
 

diff --git a/src/cbdata.cc b/src/cbdata.cc
index cd4ce8f998d07d660e9292cee950625b563c5db0..3af82631422afa3319ef9ebd9f9fc75e3a4113bf 100644 (file)
--- a/src/cbdata.cc
+++ b/src/cbdata.cc
@@ -272,13 +272,13 @@ void
 cbdataRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("cbdata",
-                            "Callback Data Registry Contents",
-                            cbdataDump, 0, 1);
+                        "Callback Data Registry Contents",
+                        cbdataDump, 0, 1);
 #if CBDATA_DEBUG
 
     Mgr::RegisterAction("cbdatahistory",
-                            "Detailed call history for all current cbdata contents",
-                            cbdataDumpHistory, 0, 1);
+                        "Detailed call history for all current cbdata contents",
+                        cbdataDumpHistory, 0, 1);
 #endif
 }
 

diff --git a/src/comm_epoll.cc b/src/comm_epoll.cc
index e5337203f994e0f32e29e8bff652a5ef03263057..d46279c206cc13d370198bc1cd2bea4c79543a29 100644 (file)
--- a/src/comm_epoll.cc
+++ b/src/comm_epoll.cc
@@ -222,8 +222,8 @@ static void
 commEPollRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("comm_epoll_incoming",
-                   "comm_incoming() stats",
-                   commIncomingStats, 0, 1);
+                        "comm_incoming() stats",
+                        commIncomingStats, 0, 1);
 }
 
 static void

diff --git a/src/comm_poll.cc b/src/comm_poll.cc
index bb48aa7cbd10bc27b02a20b191cde70930caba95..60bc70a29add1cb14ea9343e6c1071ce753295bd 100644 (file)
--- a/src/comm_poll.cc
+++ b/src/comm_poll.cc
@@ -626,8 +626,8 @@ static void
 commPollRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("comm_poll_incoming",
-                   "comm_incoming() stats",
-                   commIncomingStats, 0, 1);
+                        "comm_incoming() stats",
+                        commIncomingStats, 0, 1);
 }
 
 void

diff --git a/src/comm_select.cc b/src/comm_select.cc
index 29f80fa9f8eeff476632130fb68810475090220f..46c39664c3eefaf6eaa632c6e2080b662e8e5188 100644 (file)
--- a/src/comm_select.cc
+++ b/src/comm_select.cc
@@ -664,8 +664,8 @@ static void
 commSelectRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("comm_select_incoming",
-                   "comm_incoming() stats",
-                   commIncomingStats, 0, 1);
+                        "comm_incoming() stats",
+                        commIncomingStats, 0, 1);
 }
 
 void

diff --git a/src/comm_select_win32.cc b/src/comm_select_win32.cc
index cbafca9ab394af43d82a578651f40bc1a147997f..58c93cb576ec6b88c273cda3122b851c504e28c2 100644 (file)
--- a/src/comm_select_win32.cc
+++ b/src/comm_select_win32.cc
@@ -686,8 +686,8 @@ static void
 commSelectRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("comm_select_incoming",
-                   "comm_incoming() stats",
-                   commIncomingStats, 0, 1);
+                        "comm_incoming() stats",
+                        commIncomingStats, 0, 1);
 }
 
 void

diff --git a/src/external_acl.cc b/src/external_acl.cc
index 9a6182251a9c81bebadfdcf602dc6883ff1ec440..192948806b62bbe46f4ce96420a0935c8c0de438 100644 (file)
--- a/src/external_acl.cc
+++ b/src/external_acl.cc
@@ -1421,8 +1421,8 @@ static void
 externalAclRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("external_acl",
-                   "External ACL stats",
-                   externalAclStats, 0, 1);
+                        "External ACL stats",
+                        externalAclStats, 0, 1);
 }
 
 void

diff --git a/src/fqdncache.cc b/src/fqdncache.cc
index b7344d8cbcf9011ed1b37f2f827cbca64afdccb5..d3cc6108c85f0d6c734cd14dcf10f056187b0e21 100644 (file)
--- a/src/fqdncache.cc
+++ b/src/fqdncache.cc
@@ -587,7 +587,7 @@ static void
 fqdncacheRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("fqdncache", "FQDN Cache Stats and Contents",
-                   fqdnStats, 0, 1);
+                        fqdnStats, 0, 1);
 
 }
 

diff --git a/src/ipc/Coordinator.cc b/src/ipc/Coordinator.cc
index 02c66fd1b5ec9ac5ed878cc63276556fde316e03..d7f341949680a85164f5f784faf0b9cb3bba6b74 100644 (file)
--- a/src/ipc/Coordinator.cc
+++ b/src/ipc/Coordinator.cc
@@ -124,7 +124,7 @@ Ipc::Coordinator::handleCacheMgrRequest(const Mgr::Request& request)
     Mgr::Action::Pointer action =
         CacheManager::GetInstance()->createRequestedAction(request.params);
     AsyncJob::Start(new Mgr::Inquirer(action,
-        Mgr::ImportHttpFdIntoComm(request.fd), request, strands_));
+                                      Mgr::ImportHttpFdIntoComm(request.fd), request, strands_));
 }
 
 void

diff --git a/src/ipc/StrandCoords.h b/src/ipc/StrandCoords.h
index 2d83f71a438254e7ce7debcebbe33512e6b80f39..1a6ea21f54fcc9cc004eb72725a4cd2d9b8f3505 100644 (file)
--- a/src/ipc/StrandCoords.h
+++ b/src/ipc/StrandCoords.h
@@ -9,7 +9,8 @@
 #include "ipc/StrandCoord.h"
 #include <vector>
 
-namespace Ipc {
+namespace Ipc
+{
 
 /// a collection of strand coordinates; the order, if any, is owner-dependent
 typedef std::vector<StrandCoord> StrandCoords;

diff --git a/src/ipc/TypedMsgHdr.h b/src/ipc/TypedMsgHdr.h
index 17468a8cafc6b6c1b22e33c9973319852d46473d..f7155ace3533ca51156c22a73a13e1f023398fe5 100644 (file)
--- a/src/ipc/TypedMsgHdr.h
+++ b/src/ipc/TypedMsgHdr.h
@@ -96,7 +96,7 @@ private:
     } ctrl; ///< same as .msg_control
 
     /// data offset for the next get/put*() to start with
-    mutable unsigned int offset; 
+    mutable unsigned int offset;
 };
 
 } // namespace Ipc

diff --git a/src/ipcache.cc b/src/ipcache.cc
index 44ff00f498f0d0c8ca0d493ede95ee564da68549..45e7fc1620cdb9b2d56d6e2c311de71580549dcb 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -701,8 +701,8 @@ static void
 ipcacheRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("ipcache",
-                   "IP Cache Stats and Contents",
-                   stat_ipcache_get, 0, 1);
+                        "IP Cache Stats and Contents",
+                        stat_ipcache_get, 0, 1);
 }
 
 

diff --git a/src/log/access_log.cc b/src/log/access_log.cc
index b1e8efa9c85223dfaba15faf62edd9e63c0f38a1..da729f6a0baaf3664c472daab05b102dcc3d1bb6 100644 (file)
--- a/src/log/access_log.cc
+++ b/src/log/access_log.cc
@@ -2293,7 +2293,7 @@ fvdbRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("via_headers", "Via Request Headers", fvdbDumpVia, 0, 1);
     Mgr::RegisterAction("forw_headers", "X-Forwarded-For Request Headers",
-                            fvdbDumpForw, 0, 1);
+                        fvdbDumpForw, 0, 1);
 }
 
 static void

diff --git a/src/mgr/Action.h b/src/mgr/Action.h
index 5e4e14f8c4fe4d022afdaff7660e72441c5b7d4a..d1f6d1df7f55793f215869fd921699eac1e52f34 100644 (file)
--- a/src/mgr/Action.h
+++ b/src/mgr/Action.h
@@ -73,7 +73,7 @@ protected:
     /// calculate and keep local action-specific information
     virtual void collect() {}
 
-    /** start writing action-specific info to Store entry; 
+    /** start writing action-specific info to Store entry;
      * may collect info during dump, especially if collect() did nothing
      * non-atomic() actions may continue writing asynchronously after returning
      */

diff --git a/src/mgr/ActionParams.cc b/src/mgr/ActionParams.cc
index 5dea7e5ca12b6a7059c22af34f1c9611d8e6ea87..c05be965285fc8cc4d6b39a97bac178ee786871a 100644 (file)
--- a/src/mgr/ActionParams.cc
+++ b/src/mgr/ActionParams.cc
@@ -10,7 +10,8 @@
 #include "ipc/TypedMsgHdr.h"
 #include "mgr/ActionParams.h"
 
-Mgr::ActionParams::ActionParams(): httpMethod(METHOD_NONE) {
+Mgr::ActionParams::ActionParams(): httpMethod(METHOD_NONE)
+{
 }
 
 Mgr::ActionParams::ActionParams(const Ipc::TypedMsgHdr &msg)

diff --git a/src/mgr/ActionProfile.h b/src/mgr/ActionProfile.h
index e0acfe76f6e9d1c2a0235b75ba349d147f2f137e..41f146a616b18d4da435dea91d12be56a2a5f635 100644 (file)
--- a/src/mgr/ActionProfile.h
+++ b/src/mgr/ActionProfile.h
@@ -22,10 +22,9 @@ public:
 
 public:
     ActionProfile(const char* aName, const char* aDesc, bool aPwReq,
-        bool anAtomic, const ActionCreatorPointer &aCreator):
-        name(aName), desc(aDesc), isPwReq(aPwReq), isAtomic(anAtomic),
-        creator(aCreator)
-    {
+                  bool anAtomic, const ActionCreatorPointer &aCreator):
+            name(aName), desc(aDesc), isPwReq(aPwReq), isAtomic(anAtomic),
+            creator(aCreator) {
     }
 
 public:

diff --git a/src/mgr/ActionWriter.cc b/src/mgr/ActionWriter.cc
index 18e0dccd366b356255e55714521b37ac304b35fb..de0557568ffa7da52b8bc97053f5796a95abe642 100644 (file)
--- a/src/mgr/ActionWriter.cc
+++ b/src/mgr/ActionWriter.cc
@@ -14,8 +14,8 @@
 CBDATA_NAMESPACED_CLASS_INIT(Mgr, ActionWriter);
 
 Mgr::ActionWriter::ActionWriter(const Action::Pointer &anAction, int aFd):
-    StoreToCommWriter(aFd, anAction->createStoreEntry()),
-    action(anAction)
+        StoreToCommWriter(aFd, anAction->createStoreEntry()),
+        action(anAction)
 {
     debugs(16, 5, HERE << "FD " << aFd << " action: " << action);
 }

diff --git a/src/mgr/BasicActions.cc b/src/mgr/BasicActions.cc
index 012e9145ddec119ecfb7d23a7c8fb5337cf6cc1f..d1ec0f6f33952e39b541880b70531451406e9b3a 100644 (file)
--- a/src/mgr/BasicActions.cc
+++ b/src/mgr/BasicActions.cc
@@ -67,7 +67,7 @@ Mgr::ReconfigureAction::Create(const Command::Pointer &cmd)
 }
 
 Mgr::ReconfigureAction::ReconfigureAction(const Command::Pointer &cmd):
-    Action(cmd)
+        Action(cmd)
 {
     debugs(16, 5, HERE);
 }
@@ -110,7 +110,7 @@ Mgr::OfflineToggleAction::Create(const Command::Pointer &cmd)
 }
 
 Mgr::OfflineToggleAction::OfflineToggleAction(const Command::Pointer &cmd):
-    Action(cmd)
+        Action(cmd)
 {
     debugs(16, 5, HERE);
 }

diff --git a/src/mgr/Command.h b/src/mgr/Command.h
index d73395eeb59e08f7c2a620564d0cace04d3bec7a..e4e2b7129166949976549f55629cad9515565a83 100644 (file)
--- a/src/mgr/Command.h
+++ b/src/mgr/Command.h
@@ -15,7 +15,8 @@ namespace Mgr
 {
 
 /// combined hard-coded action profile with user-supplied action parameters
-class Command: public RefCountable {
+class Command: public RefCountable
+{
 public:
     typedef RefCount<Command> Pointer;
 

diff --git a/src/mgr/CountersAction.cc b/src/mgr/CountersAction.cc
index e780fa43aa2292f8ec278767c5f5f9f2757ff865..e65eee760bde299047bb9bc321d2b37a400b3695 100644 (file)
--- a/src/mgr/CountersAction.cc
+++ b/src/mgr/CountersAction.cc
@@ -93,7 +93,7 @@ Mgr::CountersAction::Create(const CommandPointer &cmd)
 }
 
 Mgr::CountersAction::CountersAction(const CommandPointer &cmd):
-    Action(cmd), data()
+        Action(cmd), data()
 {
     debugs(16, 5, HERE);
 }

diff --git a/src/mgr/Filler.cc b/src/mgr/Filler.cc
index 8646cd85864419f5ca2c2faafd650b61499d0919..a1afd6040464502f1088453fe8ad85c00ae5d342 100644 (file)
--- a/src/mgr/Filler.cc
+++ b/src/mgr/Filler.cc
@@ -16,9 +16,9 @@ CBDATA_NAMESPACED_CLASS_INIT(Mgr, Filler);
 
 Mgr::Filler::Filler(const Action::Pointer &anAction, int aFd,
                     unsigned int aRequestId):
-    StoreToCommWriter(aFd, anAction->createStoreEntry()),
-    action(anAction),
-    requestId(aRequestId)
+        StoreToCommWriter(aFd, anAction->createStoreEntry()),
+        action(anAction),
+        requestId(aRequestId)
 {
     debugs(16, 5, HERE << "FD " << aFd << " action: " << action);
 }

diff --git a/src/mgr/Forwarder.cc b/src/mgr/Forwarder.cc
index 02a61789289768e2b17d2d8888a8f4fd657ad904..3d518d0212298371ad4819ce95d428c3a3523da8 100644 (file)
--- a/src/mgr/Forwarder.cc
+++ b/src/mgr/Forwarder.cc
@@ -25,10 +25,10 @@ Mgr::Forwarder::RequestsMap Mgr::Forwarder::TheRequestsMap;
 unsigned int Mgr::Forwarder::LastRequestId = 0;
 
 Mgr::Forwarder::Forwarder(int aFd, const ActionParams &aParams,
-    HttpRequest* aRequest, StoreEntry* anEntry):
-    AsyncJob("Mgr::Forwarder"),
-    params(aParams),
-    request(aRequest), entry(anEntry), fd(aFd), requestId(0), closer(NULL)
+                          HttpRequest* aRequest, StoreEntry* anEntry):
+        AsyncJob("Mgr::Forwarder"),
+        params(aParams),
+        request(aRequest), entry(anEntry), fd(aFd), requestId(0), closer(NULL)
 {
     debugs(16, 5, HERE << "FD " << aFd);
     Must(fd >= 0);
@@ -40,7 +40,7 @@ Mgr::Forwarder::Forwarder(int aFd, const ActionParams &aParams,
     EBIT_SET(entry->flags, ENTRY_FWD_HDR_WAIT);
 
     closer = asyncCall(16, 5, "Mgr::Forwarder::noteCommClosed",
-        CommCbMemFunT<Forwarder, CommCloseCbParams>(this, &Forwarder::noteCommClosed));
+                       CommCbMemFunT<Forwarder, CommCloseCbParams>(this, &Forwarder::noteCommClosed));
     comm_add_close_handler(fd, closer);
 }
 
@@ -59,7 +59,8 @@ Mgr::Forwarder::~Forwarder()
 
 /// closes our copy of the client HTTP connection socket
 void
-Mgr::Forwarder::close() {
+Mgr::Forwarder::close()
+{
     if (fd >= 0) {
         if (closer != NULL) {
             comm_remove_close_handler(fd, closer);
@@ -76,30 +77,29 @@ Mgr::Forwarder::start()
     debugs(16, 3, HERE);
     entry->registerAbort(&Forwarder::Abort, this);
 
-        typedef NullaryMemFunT<Mgr::Forwarder> Dialer;
-        AsyncCall::Pointer callback = JobCallback(16, 5, Dialer, this,
-                                                  Forwarder::handleRemoteAck);
-        if (++LastRequestId == 0) // don't use zero value as requestId
-            ++LastRequestId;
-        requestId = LastRequestId;
-        TheRequestsMap[requestId] = callback;
-        Request mgrRequest(KidIdentifier, requestId, fd, params);
-        Ipc::TypedMsgHdr message;
+    typedef NullaryMemFunT<Mgr::Forwarder> Dialer;
+    AsyncCall::Pointer callback = JobCallback(16, 5, Dialer, this,
+                                  Forwarder::handleRemoteAck);
+    if (++LastRequestId == 0) // don't use zero value as requestId
+        ++LastRequestId;
+    requestId = LastRequestId;
+    TheRequestsMap[requestId] = callback;
+    Request mgrRequest(KidIdentifier, requestId, fd, params);
+    Ipc::TypedMsgHdr message;
 
     try {
         mgrRequest.pack(message);
-    } 
-    catch (...) {
+    } catch (...) {
         // assume the pack() call failed because the message did not fit
         // TODO: add a more specific exception?
         debugs(16, DBG_CRITICAL, "ERROR: uri " << entry->url() << " exceeds buffer size");
         quitOnError("long URI", errorCon(ERR_INVALID_URL, HTTP_REQUEST_URI_TOO_LARGE, request));
     }
 
-        Ipc::SendMessage(Ipc::coordinatorAddr, message);
-        const double timeout = 10; // in seconds
-        eventAdd("Mgr::Forwarder::requestTimedOut", &Forwarder::RequestTimedOut,
-            this, timeout, 0, false);
+    Ipc::SendMessage(Ipc::coordinatorAddr, message);
+    const double timeout = 10; // in seconds
+    eventAdd("Mgr::Forwarder::requestTimedOut", &Forwarder::RequestTimedOut,
+             this, timeout, 0, false);
 }
 
 void

diff --git a/src/mgr/Forwarder.h b/src/mgr/Forwarder.h
index 21f2427eec05d8c679212dda0f70c1aacec3cf42..470a1a3fc7f42423a99e0b60385bba297051d7e4 100644 (file)
--- a/src/mgr/Forwarder.h
+++ b/src/mgr/Forwarder.h
@@ -29,7 +29,7 @@ class Forwarder: public AsyncJob
 {
 public:
     Forwarder(int aFd, const ActionParams &aParams, HttpRequest* aRequest,
-        StoreEntry* anEntry);
+              StoreEntry* anEntry);
     virtual ~Forwarder();
 
     /// finds and calls the right Forwarder upon Coordinator's response

diff --git a/src/mgr/FunAction.cc b/src/mgr/FunAction.cc
index e7f11d89e794000a8d6aa3c284293d96fe63a2d2..4e7bc4927048114ce0ab4a5893bd5527076e1b65 100644 (file)
--- a/src/mgr/FunAction.cc
+++ b/src/mgr/FunAction.cc
@@ -21,7 +21,7 @@ Mgr::FunAction::Create(const Command::Pointer &aCmd, OBJH* aHandler)
 }
 
 Mgr::FunAction::FunAction(const Command::Pointer &aCmd, OBJH* aHandler):
-    Action(aCmd), handler(aHandler)
+        Action(aCmd), handler(aHandler)
 {
     Must(handler != NULL);
     debugs(16, 5, HERE);

diff --git a/src/mgr/FunAction.h b/src/mgr/FunAction.h
index 2b70e0b04a69621f96b0a3cc676381e165181d81..d3fe89784ed983a69a785c2b1c9aea247d32eb83 100644 (file)
--- a/src/mgr/FunAction.h
+++ b/src/mgr/FunAction.h
@@ -46,8 +46,7 @@ public:
     explicit FunActionCreator(OBJH *aHandler): handler(aHandler) {}
 
     /* ActionCreator API */
-    virtual Action::Pointer create(const CommandPointer &cmd) const
-    {
+    virtual Action::Pointer create(const CommandPointer &cmd) const {
         return FunAction::Create(cmd, handler);
     }
 

diff --git a/src/mgr/InfoAction.cc b/src/mgr/InfoAction.cc
index 1f93cc4995d33dd5ba180fabbe8a159caaa78411..27adf22ec872ce02a3fb6f78e9ab2df706c24c54 100644 (file)
--- a/src/mgr/InfoAction.cc
+++ b/src/mgr/InfoAction.cc
@@ -139,7 +139,7 @@ Mgr::InfoAction::Create(const CommandPointer &cmd)
 }
 
 Mgr::InfoAction::InfoAction(const CommandPointer &cmd):
-    Action(cmd), data()
+        Action(cmd), data()
 {
     debugs(16, 5, HERE);
 }

diff --git a/src/mgr/Inquirer.cc b/src/mgr/Inquirer.cc
index bd36180debb24694d7c608f3d7f333f048835656..3f9dc27e5ec5494493d1a91bcff1b8c90776e120 100644 (file)
--- a/src/mgr/Inquirer.cc
+++ b/src/mgr/Inquirer.cc
@@ -27,18 +27,19 @@ unsigned int Mgr::Inquirer::LastRequestId = 0;
 
 /// compare Ipc::StrandCoord using kidId, for std::sort() below
 static bool
-LesserStrandByKidId(const Ipc::StrandCoord &c1, const Ipc::StrandCoord &c2) {
+LesserStrandByKidId(const Ipc::StrandCoord &c1, const Ipc::StrandCoord &c2)
+{
     return c1.kidId < c2.kidId;
 }
 
-Mgr::Inquirer::Inquirer(Action::Pointer anAction, int aFd, 
-    const Request &aCause, const Ipc::StrandCoords &coords):
-    AsyncJob("Mgr::Inquirer"),
-    aggrAction(anAction),
-    cause(aCause),
-    fd(aFd),
-    strands(coords), pos(strands.begin()),
-    requestId(0), closer(NULL), timeout(aggrAction->atomic() ? 10 : 100)
+Mgr::Inquirer::Inquirer(Action::Pointer anAction, int aFd,
+                        const Request &aCause, const Ipc::StrandCoords &coords):
+        AsyncJob("Mgr::Inquirer"),
+        aggrAction(anAction),
+        cause(aCause),
+        fd(aFd),
+        strands(coords), pos(strands.begin()),
+        requestId(0), closer(NULL), timeout(aggrAction->atomic() ? 10 : 100)
 {
     debugs(16, 5, HERE << "FD " << aFd << " action: " << aggrAction);
 
@@ -46,7 +47,7 @@ Mgr::Inquirer::Inquirer(Action::Pointer anAction, int aFd,
     std::sort(strands.begin(), strands.end(), LesserStrandByKidId);
 
     closer = asyncCall(16, 5, "Mgr::Inquirer::noteCommClosed",
-        CommCbMemFunT<Inquirer, CommCloseCbParams>(this, &Inquirer::noteCommClosed));
+                       CommCbMemFunT<Inquirer, CommCloseCbParams>(this, &Inquirer::noteCommClosed));
     comm_add_close_handler(fd, closer);
 }
 
@@ -58,7 +59,8 @@ Mgr::Inquirer::~Inquirer()
 
 /// closes our copy of the client HTTP connection socket
 void
-Mgr::Inquirer::close() {
+Mgr::Inquirer::close()
+{
     if (fd >= 0) {
         removeCloseHandler();
         comm_close(fd);
@@ -87,7 +89,7 @@ Mgr::Inquirer::start()
     reply->header.putStr(HDR_CONNECTION, "close"); // until we chunk response
     std::auto_ptr<MemBuf> replyBuf(reply->pack());
     writer = asyncCall(16, 5, "Mgr::Inquirer::noteWroteHeader",
-        CommCbMemFunT<Inquirer, CommIoCbParams>(this, &Inquirer::noteWroteHeader));
+                       CommCbMemFunT<Inquirer, CommIoCbParams>(this, &Inquirer::noteWroteHeader));
     comm_write_mbuf(fd, replyBuf.get(), writer);
 }
 
@@ -114,7 +116,7 @@ Mgr::Inquirer::inquire()
 
     Must(requestId == 0);
     AsyncCall::Pointer callback = asyncCall(16, 5, "Mgr::Inquirer::handleRemoteAck",
-        HandleAckDialer(this, &Inquirer::handleRemoteAck, Response()));
+                                            HandleAckDialer(this, &Inquirer::handleRemoteAck, Response()));
     if (++LastRequestId == 0) // don't use zero value as requestId
         ++LastRequestId;
     requestId = LastRequestId;
@@ -122,12 +124,12 @@ Mgr::Inquirer::inquire()
     debugs(16, 4, HERE << "inquire kid: " << kidId << status());
     TheRequestsMap[requestId] = callback;
     Request mgrRequest(KidIdentifier, requestId, fd,
-        aggrAction->command().params);
+                       aggrAction->command().params);
     Ipc::TypedMsgHdr message;
     mgrRequest.pack(message);
     Ipc::SendMessage(Ipc::Port::MakeAddr(Ipc::strandAddrPfx, kidId), message);
     eventAdd("Mgr::Inquirer::requestTimedOut", &Inquirer::RequestTimedOut,
-        this, timeout, 0, false);
+             this, timeout, 0, false);
 }
 
 /// called when a strand is done writing its output

diff --git a/src/mgr/Inquirer.h b/src/mgr/Inquirer.h
index c59530da80be217e27205e7e57008130d125db67..7059daa2b3945a2c72e12e2b13dc9fc63f40a9c2 100644 (file)
--- a/src/mgr/Inquirer.h
+++ b/src/mgr/Inquirer.h
@@ -28,7 +28,7 @@ class Inquirer: public AsyncJob
 {
 public:
     Inquirer(Action::Pointer anAction, int aFd, const Request &aCause,
-        const Ipc::StrandCoords &coords);
+             const Ipc::StrandCoords &coords);
     virtual ~Inquirer();
 
     /// finds and calls the right Inquirer upon strand's response

diff --git a/src/mgr/IntervalAction.cc b/src/mgr/IntervalAction.cc
index 3c8d5dd44650e35750629830e890ed11d605112f..1186b38ff5fe84146f8998463babcba9ec24896b 100644 (file)
--- a/src/mgr/IntervalAction.cc
+++ b/src/mgr/IntervalAction.cc
@@ -118,7 +118,7 @@ Mgr::IntervalAction::Create60min(const CommandPointer &cmd)
 }
 
 Mgr::IntervalAction::IntervalAction(const CommandPointer &cmd, int aMinutes, int aHours):
-    Action(cmd), minutes(aMinutes), hours(aHours), data()
+        Action(cmd), minutes(aMinutes), hours(aHours), data()
 {
     debugs(16, 5, HERE);
 }

diff --git a/src/mgr/IoAction.cc b/src/mgr/IoAction.cc
index 87ab7926ca483428c68c7ed117a959a493319bd7..4e60968827ee7f23482e35b41c4bc352c87e0b8b 100644 (file)
--- a/src/mgr/IoAction.cc
+++ b/src/mgr/IoAction.cc
@@ -45,7 +45,7 @@ Mgr::IoAction::Create(const CommandPointer &cmd)
 }
 
 Mgr::IoAction::IoAction(const CommandPointer &cmd):
-    Action(cmd), data()
+        Action(cmd), data()
 {
     debugs(16, 5, HERE);
 }

diff --git a/src/mgr/Registration.cc b/src/mgr/Registration.cc
index e6da0e768578d8ed2d5761cde143749ce8d0c4ff..7e7491072cf6608a03c2edcf239093d79e2cffaa 100644 (file)
--- a/src/mgr/Registration.cc
+++ b/src/mgr/Registration.cc
@@ -11,18 +11,18 @@
 
 void
 Mgr::RegisterAction(char const * action, char const * desc,
-    OBJH * handler,
-    int pw_req_flag, int atomic)
+                    OBJH * handler,
+                    int pw_req_flag, int atomic)
 {
     CacheManager::GetInstance()->registerProfile(action, desc, handler,
-        pw_req_flag, atomic);
+            pw_req_flag, atomic);
 }
 
 void
 Mgr::RegisterAction(char const * action, char const * desc,
-    ClassActionCreationHandler *handler,
-    int pw_req_flag, int atomic)
+                    ClassActionCreationHandler *handler,
+                    int pw_req_flag, int atomic)
 {
     CacheManager::GetInstance()->registerProfile(action, desc, handler,
-        pw_req_flag, atomic);
+            pw_req_flag, atomic);
 }

diff --git a/src/mgr/Registration.h b/src/mgr/Registration.h
index caaa10e74d3fa43492a01379eb3fe6c885c01e90..cfdf137ccfe99ba8199f498d0e35ea20c7330e43 100644 (file)
--- a/src/mgr/Registration.h
+++ b/src/mgr/Registration.h
@@ -15,12 +15,12 @@ namespace Mgr
 {
 
 void RegisterAction(char const * action, char const * desc,
-    OBJH * handler,
-       int pw_req_flag, int atomic);
+                    OBJH * handler,
+                    int pw_req_flag, int atomic);
 
 void RegisterAction(char const * action, char const * desc,
-    ClassActionCreationHandler *handler,
-    int pw_req_flag, int atomic);
+                    ClassActionCreationHandler *handler,
+                    int pw_req_flag, int atomic);
 
 } // namespace Mgr
 

diff --git a/src/mgr/Request.cc b/src/mgr/Request.cc
index b80ad19cda0fd5c91ac0677e6b52b4a31d43d1ba..a0f4014cdd19b5f40040a56ed239624048cbb76b 100644 (file)
--- a/src/mgr/Request.cc
+++ b/src/mgr/Request.cc
@@ -13,9 +13,9 @@
 
 
 Mgr::Request::Request(int aRequestorId, unsigned int aRequestId, int aFd,
-    const ActionParams &aParams):
-    requestorId(aRequestorId), requestId(aRequestId),
-    fd(aFd), params(aParams)
+                      const ActionParams &aParams):
+        requestorId(aRequestorId), requestId(aRequestId),
+        fd(aFd), params(aParams)
 {
     Must(requestorId > 0);
     Must(requestId != 0);

diff --git a/src/mgr/Request.h b/src/mgr/Request.h
index edeaaf4852baa3ef3019b26ec8d8b247ec39cb66..89924f683713d666a4de190957ab4de0341d95ee 100644 (file)
--- a/src/mgr/Request.h
+++ b/src/mgr/Request.h
@@ -15,12 +15,12 @@
 namespace Mgr
 {
 
-/// cache manager request 
+/// cache manager request
 class Request
 {
 public:
     Request(int aRequestorId, unsigned int aRequestId, int aFd,
-        const ActionParams &aParams);
+            const ActionParams &aParams);
 
     explicit Request(const Ipc::TypedMsgHdr& msg); ///< from recvmsg()
     void pack(Ipc::TypedMsgHdr& msg) const; ///< prepare for sendmsg()

diff --git a/src/mgr/Response.cc b/src/mgr/Response.cc
index 1462e6c3b0235553aac95e6c75ba090529d06c96..e3204f814f15bb3048c5e6158ea7adce9b6c756e 100644 (file)
--- a/src/mgr/Response.cc
+++ b/src/mgr/Response.cc
@@ -22,7 +22,7 @@ std::ostream& Mgr::operator << (std::ostream &os, const Response& response)
 }
 
 Mgr::Response::Response(unsigned int aRequestId, Action::Pointer anAction):
-    requestId(aRequestId), action(anAction)
+        requestId(aRequestId), action(anAction)
 {
     Must(!action || action->name()); // if there is an action, it must be named
 }

diff --git a/src/mgr/ServiceTimesAction.cc b/src/mgr/ServiceTimesAction.cc
index 3c083c37cf7576e3b6211f075d93b1cabac58857..b02681b9b46cf3ba4a05e70503223884f4edd93c 100644 (file)
--- a/src/mgr/ServiceTimesAction.cc
+++ b/src/mgr/ServiceTimesAction.cc
@@ -58,7 +58,7 @@ Mgr::ServiceTimesAction::Create(const CommandPointer &cmd)
 }
 
 Mgr::ServiceTimesAction::ServiceTimesAction(const CommandPointer &cmd):
-    Action(cmd), data()
+        Action(cmd), data()
 {
     debugs(16, 5, HERE);
 }

diff --git a/src/mgr/StoreIoAction.cc b/src/mgr/StoreIoAction.cc
index 41866c49e8ea8c2680aba6c6ade9bab015ad3825..8eb056fea7db42c022642677f1cc1a43945e7255 100644 (file)
--- a/src/mgr/StoreIoAction.cc
+++ b/src/mgr/StoreIoAction.cc
@@ -36,7 +36,7 @@ Mgr::StoreIoAction::Create(const CommandPointer &cmd)
 }
 
 Mgr::StoreIoAction::StoreIoAction(const CommandPointer &cmd):
-    Action(cmd), data()
+        Action(cmd), data()
 {
     debugs(16, 5, HERE);
 }

diff --git a/src/mgr/StoreToCommWriter.cc b/src/mgr/StoreToCommWriter.cc
index b659f40b6f15ef5ee4fb989fcbff2c6c634fe397..6eb3d22d75e80592d431fbb9632bcfa30f1cb7c9 100644 (file)
--- a/src/mgr/StoreToCommWriter.cc
+++ b/src/mgr/StoreToCommWriter.cc
@@ -18,12 +18,12 @@ CBDATA_NAMESPACED_CLASS_INIT(Mgr, StoreToCommWriter);
 
 
 Mgr::StoreToCommWriter::StoreToCommWriter(int aFd, StoreEntry* anEntry):
-    AsyncJob("Mgr::StoreToCommWriter"),
-    fd(aFd), entry(anEntry), sc(NULL), writeOffset(0), closer(NULL)
+        AsyncJob("Mgr::StoreToCommWriter"),
+        fd(aFd), entry(anEntry), sc(NULL), writeOffset(0), closer(NULL)
 {
     debugs(16, 6, HERE << "FD " << fd);
     closer = asyncCall(16, 5, "Mgr::StoreToCommWriter::noteCommClosed",
-        CommCbMemFunT<StoreToCommWriter, CommCloseCbParams>(this, &StoreToCommWriter::noteCommClosed));
+                       CommCbMemFunT<StoreToCommWriter, CommCloseCbParams>(this, &StoreToCommWriter::noteCommClosed));
     comm_add_close_handler(fd, closer);
 }
 
@@ -82,7 +82,7 @@ Mgr::StoreToCommWriter::NoteStoreCopied(void* data, StoreIOBuffer ioBuf)
     typedef UnaryMemFunT<StoreToCommWriter, StoreIOBuffer> MyDialer;
     AsyncCall::Pointer call =
         asyncCall(16, 5, "Mgr::StoreToCommWriter::noteStoreCopied",
-            MyDialer(writer, &StoreToCommWriter::noteStoreCopied, ioBuf));
+                  MyDialer(writer, &StoreToCommWriter::noteStoreCopied, ioBuf));
     ScheduleCallHere(call);
 }
 
@@ -107,7 +107,7 @@ Mgr::StoreToCommWriter::scheduleCommWrite(const StoreIOBuffer& ioBuf)
     typedef CommCbMemFunT<StoreToCommWriter, CommIoCbParams> MyDialer;
     AsyncCall::Pointer writer =
         asyncCall(16, 5, "Mgr::StoreToCommWriter::noteCommWrote",
-            MyDialer(this, &StoreToCommWriter::noteCommWrote));
+                  MyDialer(this, &StoreToCommWriter::noteCommWrote));
     comm_write(fd, ioBuf.data, ioBuf.length, writer);
 }
 
@@ -152,8 +152,8 @@ bool
 Mgr::StoreToCommWriter::doneAll() const
 {
     return entry &&
-        entry->store_status == STORE_OK && // the action is over
-        writeOffset >= entry->objectLen(); // we wrote all the results
+           entry->store_status == STORE_OK && // the action is over
+           writeOffset >= entry->objectLen(); // we wrote all the results
 }
 
 void

diff --git a/src/neighbors.cc b/src/neighbors.cc
index 55e8ab772550e25ea0588ef343334deaf7fcc893..76edcc34d79f82f90232cae9a231a20922311f0f 100644 (file)
--- a/src/neighbors.cc
+++ b/src/neighbors.cc
@@ -542,13 +542,13 @@ static void
 neighborsRegisterWithCacheManager()
 {
     Mgr::RegisterAction("server_list",
-                            "Peer Cache Statistics",
-                            neighborDumpPeers, 0, 1);
+                        "Peer Cache Statistics",
+                        neighborDumpPeers, 0, 1);
 
     if (theInIcpConnection >= 0) {
         Mgr::RegisterAction("non_peers",
-                                "List of Unknown sites sending ICP messages",
-                                neighborDumpNonPeers, 0, 1);
+                            "List of Unknown sites sending ICP messages",
+                            neighborDumpNonPeers, 0, 1);
     }
 }
 

diff --git a/src/pconn.cc b/src/pconn.cc
index d024c383310128e7d0fde741b6f94629d3592e5a..e2fcad7cbb1f36b862adc38c59f2b0ac5193d53e 100644 (file)
--- a/src/pconn.cc
+++ b/src/pconn.cc
@@ -362,8 +362,8 @@ void
 PconnModule::registerWithCacheManager(void)
 {
     Mgr::RegisterAction("pconn",
-                   "Persistent Connection Utilization Histograms",
-                   DumpWrapper, 0, 1);
+                        "Persistent Connection Utilization Histograms",
+                        DumpWrapper, 0, 1);
 }
 
 void

diff --git a/src/peer_sourcehash.cc b/src/peer_sourcehash.cc
index fb21b321bc0c40d2fefef26c50a93c1bc83e8cca..f353975bd29009661a84de30743720ad703df21f 100644 (file)
--- a/src/peer_sourcehash.cc
+++ b/src/peer_sourcehash.cc
@@ -158,7 +158,7 @@ static void
 peerSourceHashRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("sourcehash", "peer sourcehash information",
-                   peerSourceHashCachemgr, 0, 1);
+                        peerSourceHashCachemgr, 0, 1);
 }
 
 peer *

diff --git a/src/peer_userhash.cc b/src/peer_userhash.cc
index f189cefdef1a3f5618c1eb5e8c08c13a64b1011b..fc7905de90e7a734b804a91fe87ffe48723b46cd 100644 (file)
--- a/src/peer_userhash.cc
+++ b/src/peer_userhash.cc
@@ -160,7 +160,7 @@ static void
 peerUserHashRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("userhash", "peer userhash information", peerUserHashCachemgr,
-                   0, 1);
+                        0, 1);
 }
 
 peer *

diff --git a/src/stat.cc b/src/stat.cc
index 9527f7200099afa77d12ca5b62fbaaf5858c8305..922ee4a3b62a2ce35f0eeb5cb15086437322f82d 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -234,10 +234,10 @@ DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry)
 
     for (i = 0; i < _iostats::histSize; i++) {
         storeAppendPrintf(sentry, "%5d-%5d: %9.0f %2.0f%%\n",
-            i ? (1 << (i - 1)) + 1 : 1,
-            1 << i,
-            stats.http_read_hist[i],
-            Math::doublePercent(stats.http_read_hist[i], stats.http_reads));
+                          i ? (1 << (i - 1)) + 1 : 1,
+                          1 << i,
+                          stats.http_read_hist[i],
+                          Math::doublePercent(stats.http_read_hist[i], stats.http_reads));
     }
 
     storeAppendPrintf(sentry, "\n");
@@ -247,10 +247,10 @@ DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry)
 
     for (i = 0; i < _iostats::histSize; i++) {
         storeAppendPrintf(sentry, "%5d-%5d: %9.0f %2.0f%%\n",
-            i ? (1 << (i - 1)) + 1 : 1,
-            1 << i,
-            stats.ftp_read_hist[i],
-            Math::doublePercent(stats.ftp_read_hist[i], stats.ftp_reads));
+                          i ? (1 << (i - 1)) + 1 : 1,
+                          1 << i,
+                          stats.ftp_read_hist[i],
+                          Math::doublePercent(stats.ftp_read_hist[i], stats.ftp_reads));
     }
 
     storeAppendPrintf(sentry, "\n");
@@ -260,10 +260,10 @@ DumpIoStats(Mgr::IoActionData& stats, StoreEntry* sentry)
 
     for (i = 0; i < _iostats::histSize; i++) {
         storeAppendPrintf(sentry, "%5d-%5d: %9.0f %2.0f%%\n",
-            i ? (1 << (i - 1)) + 1 : 1,
-            1 << i,
-            stats.gopher_read_hist[i],
-            Math::doublePercent(stats.gopher_read_hist[i], stats.gopher_reads));
+                          i ? (1 << (i - 1)) + 1 : 1,
+                          1 << i,
+                          stats.gopher_read_hist[i],
+                          Math::doublePercent(stats.gopher_read_hist[i], stats.gopher_reads));
     }
 
     storeAppendPrintf(sentry, "\n");
@@ -1099,15 +1099,15 @@ GetAvgStat(Mgr::IntervalActionData& stats, int minutes, int hours)
     stats.client_http_kbytes_out = XAVG(client_http.kbytes_out.kb);
 
     stats.client_http_all_median_svc_time = statHistDeltaMedian(&l->client_http.all_svc_time,
-        &f->client_http.all_svc_time) / 1000.0;
+                                            &f->client_http.all_svc_time) / 1000.0;
     stats.client_http_miss_median_svc_time = statHistDeltaMedian(&l->client_http.miss_svc_time,
-        &f->client_http.miss_svc_time) / 1000.0;
+            &f->client_http.miss_svc_time) / 1000.0;
     stats.client_http_nm_median_svc_time = statHistDeltaMedian(&l->client_http.nm_svc_time,
-        &f->client_http.nm_svc_time) / 1000.0;
+                                           &f->client_http.nm_svc_time) / 1000.0;
     stats.client_http_nh_median_svc_time = statHistDeltaMedian(&l->client_http.nh_svc_time,
-        &f->client_http.nh_svc_time) / 1000.0;
+                                           &f->client_http.nh_svc_time) / 1000.0;
     stats.client_http_hit_median_svc_time = statHistDeltaMedian(&l->client_http.hit_svc_time,
-        &f->client_http.hit_svc_time) / 1000.0;
+                                            &f->client_http.hit_svc_time) / 1000.0;
 
     stats.server_all_requests = XAVG(server.all.requests);
     stats.server_all_errors = XAVG(server.all.errors);
@@ -1145,18 +1145,18 @@ GetAvgStat(Mgr::IntervalActionData& stats, int minutes, int hours)
     stats.icp_r_kbytes_recv = XAVG(icp.r_kbytes_recv.kb);
 
     stats.icp_query_median_svc_time = statHistDeltaMedian(&l->icp.query_svc_time,
-        &f->icp.query_svc_time) / 1000000.0;
+                                      &f->icp.query_svc_time) / 1000000.0;
     stats.icp_reply_median_svc_time = statHistDeltaMedian(&l->icp.reply_svc_time,
-        &f->icp.reply_svc_time) / 1000000.0;
+                                      &f->icp.reply_svc_time) / 1000000.0;
     stats.dns_median_svc_time = statHistDeltaMedian(&l->dns.svc_time,
-        &f->dns.svc_time) / 1000.0;
+                                &f->dns.svc_time) / 1000.0;
 
     stats.unlink_requests = XAVG(unlink.requests);
     stats.page_faults = XAVG(page_faults);
     stats.select_loops = XAVG(select_loops);
     stats.select_fds = XAVG(select_fds);
     stats.average_select_fd_period = f->select_fds > l->select_fds ?
-        (f->select_time - l->select_time) / (f->select_fds - l->select_fds) : 0.0;
+                                     (f->select_time - l->select_time) / (f->select_fds - l->select_fds) : 0.0;
 
     stats.median_select_fds = statHistDeltaMedian(&l->select_fds_hist, &f->select_fds_hist);
     stats.swap_outs = XAVG(swap.outs);
@@ -1342,43 +1342,43 @@ static void
 statRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("info", "General Runtime Information",
-                            &Mgr::InfoAction::Create, 0, 1);
+                        &Mgr::InfoAction::Create, 0, 1);
     Mgr::RegisterAction("service_times", "Service Times (Percentiles)",
-                            &Mgr::ServiceTimesAction::Create, 0, 1);
+                        &Mgr::ServiceTimesAction::Create, 0, 1);
     Mgr::RegisterAction("filedescriptors", "Process Filedescriptor Allocation",
-                            fde::DumpStats, 0, 1);
+                        fde::DumpStats, 0, 1);
     Mgr::RegisterAction("objects", "All Cache Objects", stat_objects_get, 0, 0);
     Mgr::RegisterAction("vm_objects", "In-Memory and In-Transit Objects",
-                            stat_vmobjects_get, 0, 0);
+                        stat_vmobjects_get, 0, 0);
     Mgr::RegisterAction("io", "Server-side network read() size histograms",
-                            &Mgr::IoAction::Create, 0, 1);
+                        &Mgr::IoAction::Create, 0, 1);
     Mgr::RegisterAction("counters", "Traffic and Resource Counters",
-                            &Mgr::CountersAction::Create, 0, 1);
+                        &Mgr::CountersAction::Create, 0, 1);
     Mgr::RegisterAction("peer_select", "Peer Selection Algorithms",
-                            statPeerSelect, 0, 1);
+                        statPeerSelect, 0, 1);
     Mgr::RegisterAction("digest_stats", "Cache Digest and ICP blob",
-                            statDigestBlob, 0, 1);
+                        statDigestBlob, 0, 1);
     Mgr::RegisterAction("5min", "5 Minute Average of Counters",
-                            &Mgr::IntervalAction::Create5min, 0, 1);
+                        &Mgr::IntervalAction::Create5min, 0, 1);
     Mgr::RegisterAction("60min", "60 Minute Average of Counters",
-                            &Mgr::IntervalAction::Create60min, 0, 1);
+                        &Mgr::IntervalAction::Create60min, 0, 1);
     Mgr::RegisterAction("utilization", "Cache Utilization",
-                            statUtilization, 0, 1);
+                        statUtilization, 0, 1);
     Mgr::RegisterAction("histograms", "Full Histogram Counts",
-                            statCountersHistograms, 0, 1);
+                        statCountersHistograms, 0, 1);
     Mgr::RegisterAction("active_requests",
-                            "Client-side Active Requests",
-                            statClientRequests, 0, 1);
+                        "Client-side Active Requests",
+                        statClientRequests, 0, 1);
     Mgr::RegisterAction("username_cache",
-                            "Active Cached Usernames",
-                            AuthUser::UsernameCacheStats, 0, 1);
+                        "Active Cached Usernames",
+                        AuthUser::UsernameCacheStats, 0, 1);
 #if DEBUG_OPENFD
     Mgr::RegisterAction("openfd_objects", "Objects with Swapout files open",
-                            statOpenfdObj, 0, 0);
+                        statOpenfdObj, 0, 0);
 #endif
 #if STAT_GRAPHS
     Mgr::RegisterAction("graph_variables", "Display cache metrics graphically",
-                            statGraphDump, 0, 1);
+                        statGraphDump, 0, 1);
 #endif
 }
 

diff --git a/src/store.cc b/src/store.cc
index e5c0a43c5857e3fbcd2454cc988de56cb5d045e7..0e1fabc63b5c4be92168922b719c9d74e3181883 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1380,7 +1380,7 @@ storeRegisterWithCacheManager(void)
     Mgr::RegisterAction("storedir", "Store Directory Stats", Store::Stats, 0, 1);
     Mgr::RegisterAction("store_io", "Store IO Interface Stats", &Mgr::StoreIoAction::Create, 0, 1);
     Mgr::RegisterAction("store_check_cachable_stats", "storeCheckCachable() Stats",
-                            storeCheckCachableStats, 0, 1);
+                        storeCheckCachableStats, 0, 1);
 }
 
 void

diff --git a/src/store_log.cc b/src/store_log.cc
index a9640dce4c227ec8b7274591c6b8bd2abb139bd3..d1113226453deb8995836ed561fcaefe04f3b9bd 100644 (file)
--- a/src/store_log.cc
+++ b/src/store_log.cc
@@ -140,7 +140,7 @@ static void
 storeLogRegisterWithCacheManager(void)
 {
     Mgr::RegisterAction("store_log_tags", "Histogram of store.log tags",
-                   storeLogTagsHist, 0, 1);
+                        storeLogTagsHist, 0, 1);
 }
 
 void

diff --git a/src/tests/stub_cache_manager.cc b/src/tests/stub_cache_manager.cc
index 7e4eb13febc9e9be883d01cf5110f6bf306ad8d3..5b4099eb73ed6b710cc394bc8fa40ee7d80e3479 100644 (file)
--- a/src/tests/stub_cache_manager.cc
+++ b/src/tests/stub_cache_manager.cc
@@ -62,7 +62,7 @@ Mgr::RegisterAction(char const*, char const*, OBJH, int, int)
 
 void
 Mgr::RegisterAction(char const * action, char const * desc,
-    Mgr::ClassActionCreationHandler *handler,
-    int pw_req_flag, int atomic)
+                    Mgr::ClassActionCreationHandler *handler,
+                    int pw_req_flag, int atomic)
 {
 }