Do not use HERE in new or changed debugs() statements.

Polished StoreEntry creation/destruction debugging.

diff --git a/src/CollapsedForwarding.cc b/src/CollapsedForwarding.cc
index e743fb4d192cca74878f6120e67b1d5ae2e1b1fa..fc48fa94fa047c62cb0f43eada5ecbe9af4abbe3 100644 (file)
--- a/src/CollapsedForwarding.cc
+++ b/src/CollapsedForwarding.cc
@@ -119,7 +119,7 @@ void
 CollapsedForwarding::HandleNotification(const Ipc::TypedMsgHdr &msg)
 {
     const int from = msg.getInt();
-    debugs(17, 7, HERE << "from " << from);
+    debugs(17, 7, "from " << from);
     assert(queue.get());
     queue->clearReaderSignal(from);
     HandleNewData("after notification");

diff --git a/src/MemStore.cc b/src/MemStore.cc
index 623794ee23e2e226e1904be8d0d9aaa0386b1235..5e27e5a6f8752b65f423bdb6cab27b4287af3469 100644 (file)
--- a/src/MemStore.cc
+++ b/src/MemStore.cc
@@ -441,7 +441,7 @@ MemStore::shouldCache(const StoreEntry &e) const
 
     // objects of unknown size are not allowed into memory cache, for now
     if (expectedSize < 0) {
-        debugs(20, 5, HERE << "Unknown expected size: " << e);
+        debugs(20, 5, "Unknown expected size: " << e);
         return false;
     }
 
@@ -460,7 +460,7 @@ MemStore::shouldCache(const StoreEntry &e) const
     }
 
     if (EBIT_TEST(e.flags, ENTRY_SPECIAL)) {
-        debugs(20, 5, HERE << "Not mem-caching ENTRY_SPECIAL " << e);
+        debugs(20, 5, "Not mem-caching ENTRY_SPECIAL " << e);
         return false;
     }
 

diff --git a/src/client_side_reply.cc b/src/client_side_reply.cc
index 68584070868fbdf71d535623a54449d4467bae8b..c29e5ea91e49471008f30869eab5afdb6f8b3da6 100644 (file)
--- a/src/client_side_reply.cc
+++ b/src/client_side_reply.cc
@@ -1608,7 +1608,7 @@ clientReplyContext::identifyFoundObject(StoreEntry *newEntry)
 
     if (http->redirect.status) {
         /** \li If redirection status is True force this to be a MISS */
-        debugs(85, 3, HERE << "REDIRECT status forced StoreEntry to NULL (no body on 3XX responses) " << *e);
+        debugs(85, 3, "REDIRECT status forced StoreEntry to NULL (no body on 3XX responses) " << *e);
         forgetHit();
         http->logType = LOG_TCP_REDIRECT;
         doGetMoreData();

diff --git a/src/fs/rock/RockRebuild.cc b/src/fs/rock/RockRebuild.cc
index 0457cabae0191a5f67438a8ea6e38ad77aa840fb..b7f57bf565342ec79e3a4f412089f26efc3c2b83 100644 (file)
--- a/src/fs/rock/RockRebuild.cc
+++ b/src/fs/rock/RockRebuild.cc
@@ -190,7 +190,7 @@ Rock::Rebuild::steps()
 void
 Rock::Rebuild::loadingSteps()
 {
-    debugs(47,5, HERE << sd->index << " slot " << loadingPos << " at " <<
+    debugs(47,5, sd->index << " slot " << loadingPos << " at " <<
            dbOffset << " <= " << dbSize);
 
     // Balance our desire to maximize the number of entries processed at once
@@ -225,7 +225,7 @@ Rock::Rebuild::loadingSteps()
 void
 Rock::Rebuild::loadOneSlot()
 {
-    debugs(47,5, HERE << sd->index << " slot " << loadingPos << " at " <<
+    debugs(47,5, sd->index << " slot " << loadingPos << " at " <<
            dbOffset << " <= " << dbSize);
 
     ++counts.scancount;
@@ -385,7 +385,7 @@ Rock::Rebuild::swanSong()
 void
 Rock::Rebuild::failure(const char *msg, int errNo)
 {
-    debugs(47,5, HERE << sd->index << " slot " << loadingPos << " at " <<
+    debugs(47,5, sd->index << " slot " << loadingPos << " at " <<
            dbOffset << " <= " << dbSize);
 
     if (errNo)

diff --git a/src/ipc/Queue.cc b/src/ipc/Queue.cc
index 120cc5a8498a784bed905b479edd3d871d6ef255..0e1cfedbddaeaf5b5e5537af43903ed3ef887a03 100644 (file)
--- a/src/ipc/Queue.cc
+++ b/src/ipc/Queue.cc
@@ -135,7 +135,7 @@ void
 Ipc::BaseMultiQueue::clearReaderSignal(const int remoteProcessId)
 {
     QueueReader &reader = localReader();
-    debugs(54, 7, HERE << "reader: " << reader.id);
+    debugs(54, 7, "reader: " << reader.id);
 
     reader.clearSignal();
 
@@ -205,7 +205,7 @@ Ipc::FewToFewBiQueue::FewToFewBiQueue(const String &id, const Group aLocalGroup,
     Must(queues->theCapacity == metadata->theGroupASize * metadata->theGroupBSize * 2);
     Must(readers->theCapacity == metadata->theGroupASize + metadata->theGroupBSize);
 
-    debugs(54, 7, HERE << "queue " << id << " reader: " << localReader().id);
+    debugs(54, 7, "queue " << id << " reader: " << localReader().id);
 }
 
 int
@@ -344,7 +344,7 @@ Ipc::MultiQueue::MultiQueue(const String &id, const int localProcessId):
     Must(queues->theCapacity == metadata->theProcessCount * metadata->theProcessCount);
     Must(readers->theCapacity == metadata->theProcessCount);
 
-    debugs(54, 7, HERE << "queue " << id << " reader: " << localReader().id);
+    debugs(54, 7, "queue " << id << " reader: " << localReader().id);
 }
 
 bool

diff --git a/src/ipc/StoreMap.cc b/src/ipc/StoreMap.cc
index 8accc31b2f8bd2035904570daa9444e66c14b89d..a70cb8372e53fcb357f014a1134dc44e2a144020 100644 (file)
--- a/src/ipc/StoreMap.cc
+++ b/src/ipc/StoreMap.cc
@@ -325,7 +325,7 @@ Ipc::StoreMap::openForReadingAt(const sfileno fileno)
 
     if (s.waitingToBeFreed) {
         s.lock.unlockShared();
-        debugs(54, 7, HERE << "cannot open marked entry " << fileno <<
+        debugs(54, 7, "cannot open marked entry " << fileno <<
                " for reading " << path);
         return NULL;
     }

diff --git a/src/store.cc b/src/store.cc
index 3373b13557a58e04150d631736d57883a00d273d..c0ed2b9bbfc330aa0c15a8998e841ebb85ef5125 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -392,11 +392,12 @@ StoreEntry::StoreEntry() :
         swap_status(SWAPOUT_NONE),
         lock_count(0)
 {
-    debugs(20, 3, HERE << "new StoreEntry " << this);
+    debugs(20, 5, "StoreEntry constructed, this=" << this);
 }
 
 StoreEntry::~StoreEntry()
 {
+    debugs(20, 5, "StoreEntry destructed, this=" << this);
 }
 
 #if USE_ADAPTATION

diff --git a/src/store_rebuild.cc b/src/store_rebuild.cc
index dd7f55828a36100e9b5ba4fd5c6951e38003ec9c..a80bc9d57810a447f4d63d60234996410a2a9a21 100644 (file)
--- a/src/store_rebuild.cc
+++ b/src/store_rebuild.cc
@@ -344,7 +344,7 @@ storeRebuildParseEntry(MemBuf &buf, StoreEntry &tmpe, cache_key *key,
 
     // TODO: consume parsed metadata?
 
-    debugs(47,7, HERE << "successful swap meta unpacking; swap_file_sz=" << tmpe.swap_file_sz);
+    debugs(47,7, "successful swap meta unpacking; swap_file_sz=" << tmpe.swap_file_sz);
     memset(key, '\0', SQUID_MD5_DIGEST_LENGTH);
 
     InitStoreEntry visitor(&tmpe, key);

diff --git a/src/store_swapout.cc b/src/store_swapout.cc
index 6ea51237889c1d52ae9fd8afb1b4b9a0331fd50c..ceea8adca94dc6a566c5d473b77b348149110308 100644 (file)
--- a/src/store_swapout.cc
+++ b/src/store_swapout.cc
@@ -381,7 +381,7 @@ StoreEntry::mayStartSwapOut()
 
     // if we swapped out already, do not start over
     if (swap_status == SWAPOUT_DONE) {
-        debugs(20, 3,  HERE << "already did");
+        debugs(20, 3, "already did");
         decision = MemObject::SwapOut::swImpossible;
         return false;
     }