Source Format Enforcement (#1234)

[thirdparty/squid.git] / src / adaptation / icap / History.cc

diff --git a/src/adaptation/icap/History.cc b/src/adaptation/icap/History.cc
index 9e0d34a86fa05cc6e0a4cce48283182d33fda30d..a75d44faff667f665efd60cdca94e93695f1b588 100644 (file)
--- a/src/adaptation/icap/History.cc
+++ b/src/adaptation/icap/History.cc
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+ * Copyright (C) 1996-2023 The Squid Software Foundation and contributors
  *
  * Squid software is distributed under GPLv2+ license and includes
  * contributions from numerous individuals and organizations.
@@ -8,12 +8,11 @@
 
 #include "squid.h"
 #include "adaptation/icap/History.h"
-#include "Debug.h"
+#include "debug/Stream.h"
 #include "globals.h"
-#include "SquidTime.h"
+#include "time/gadgets.h"
 
 Adaptation::Icap::History::History():
-    logType(LOG_TAG_NONE),
     req_sz(0),
     concurrencyLevel(0)
 {
@@ -26,20 +25,20 @@ void Adaptation::Icap::History::start(const char *context)
     if (!concurrencyLevel++)
         currentStart = current_time;
 
-    debugs(93,4, HERE << "start " << context << " level=" << concurrencyLevel
+    debugs(93,4, "start " << context << " level=" << concurrencyLevel
            << " time=" << tvToMsec(pastTime) << ' ' << this);
 }
 
 void Adaptation::Icap::History::stop(const char *context)
 {
     if (!concurrencyLevel) {
-        debugs(93, DBG_IMPORTANT, HERE << "Internal error: poor history accounting " << this);
+        debugs(93, DBG_IMPORTANT, "ERROR: Squid BUG: poor history accounting " << this);
         return;
     }
 
     struct timeval current;
     currentTime(current);
-    debugs(93,4, HERE << "stop " << context << " level=" << concurrencyLevel <<
+    debugs(93,4, "stop " << context << " level=" << concurrencyLevel <<
            " time=" << tvToMsec(pastTime) << '+' << tvToMsec(current) << ' ' << this);
 
     if (!--concurrencyLevel)
@@ -51,7 +50,7 @@ Adaptation::Icap::History::processingTime(timeval &total) const
 {
     currentTime(total);
     tvAssignAdd(total, pastTime);
-    debugs(93,7, HERE << " current total: " << tvToMsec(total) << ' ' << this);
+    debugs(93,7, " current total: " << tvToMsec(total) << ' ' << this);
 }
 
 void