Cleanup: Use SBuf for peer Digest labels (#326)

... removing one more unnecessary use of String.

diff --git a/src/CacheDigest.cc b/src/CacheDigest.cc
index 4e2da9d63a2cdb7ef63509ab41dcc39d01286821..7b2bcf04842917bcd7c02b8ab3f9c17be1a6ea92 100644 (file)
--- a/src/CacheDigest.cc
+++ b/src/CacheDigest.cc
@@ -217,7 +217,7 @@ cacheDigestGuessStatsUpdate(CacheDigestGuessStats * stats, int real_hit, int gue
 }
 
 void
-cacheDigestGuessStatsReport(const CacheDigestGuessStats * stats, StoreEntry * sentry, const char *label)
+cacheDigestGuessStatsReport(const CacheDigestGuessStats * stats, StoreEntry * sentry, const SBuf &label)
 {
     const int true_count = stats->trueHits + stats->trueMisses;
     const int false_count = stats->falseHits + stats->falseMisses;
@@ -225,15 +225,15 @@ cacheDigestGuessStatsReport(const CacheDigestGuessStats * stats, StoreEntry * se
     const int miss_count = stats->trueMisses + stats->falseMisses;
     const int tot_count = true_count + false_count;
 
-    assert(label);
+    assert(!label.isEmpty());
     assert(tot_count == hit_count + miss_count);    /* paranoid */
 
     if (!tot_count) {
-        storeAppendPrintf(sentry, "no guess stats for %s available\n", label);
+        storeAppendPrintf(sentry, "no guess stats for " SQUIDSBUFPH " available\n", SQUIDSBUFPRINT(label));
         return;
     }
 
-    storeAppendPrintf(sentry, "Digest guesses stats for %s:\n", label);
+    storeAppendPrintf(sentry, "Digest guesses stats for " SQUIDSBUFPH ":\n", SQUIDSBUFPRINT(label));
     storeAppendPrintf(sentry, "guess\t hit\t\t miss\t\t total\t\t\n");
     storeAppendPrintf(sentry, " \t #\t %%\t #\t %%\t #\t %%\t\n");
     storeAppendPrintf(sentry, "true\t %d\t %.2f\t %d\t %.2f\t %d\t %.2f\n",
@@ -253,13 +253,13 @@ cacheDigestGuessStatsReport(const CacheDigestGuessStats * stats, StoreEntry * se
 }
 
 void
-cacheDigestReport(CacheDigest * cd, const char *label, StoreEntry * e)
+cacheDigestReport(CacheDigest * cd, const SBuf &label, StoreEntry * e)
 {
     CacheDigestStats stats;
     assert(cd && e);
     cacheDigestStats(cd, &stats);
-    storeAppendPrintf(e, "%s digest: size: %d bytes\n",
-                      label ? label : "", stats.bit_count / 8
+    storeAppendPrintf(e, SQUIDSBUFPH " digest: size: %d bytes\n",
+                      SQUIDSBUFPRINT(label), stats.bit_count / 8
                      );
     storeAppendPrintf(e, "\t entries: count: %" PRIu64 " capacity: %" PRIu64 " util: %d%%\n",
                       cd->count,

diff --git a/src/CacheDigest.h b/src/CacheDigest.h
index 9fc266bb8ac7e8844cbff6abac9c6324a72dcd12..c007e7dff24d77e8873f9208fbe16242d2ff1258 100644 (file)
--- a/src/CacheDigest.h
+++ b/src/CacheDigest.h
@@ -61,8 +61,8 @@ public:
 };
 
 void cacheDigestGuessStatsUpdate(CacheDigestGuessStats * stats, int real_hit, int guess_hit);
-void cacheDigestGuessStatsReport(const CacheDigestGuessStats * stats, StoreEntry * sentry, const char *label);
-void cacheDigestReport(CacheDigest * cd, const char *label, StoreEntry * e);
+void cacheDigestGuessStatsReport(const CacheDigestGuessStats * stats, StoreEntry * sentry, const SBuf &label);
+void cacheDigestReport(CacheDigest * cd, const SBuf &label, StoreEntry * e);
 
 #endif /* SQUID_CACHEDIGEST_H_ */
 

diff --git a/src/PeerDigest.h b/src/PeerDigest.h
index 17a366010efa0e924f8de882668620d080b64217..cdf4ab056639cb79092e26358a72c40e3df32c83 100644 (file)
--- a/src/PeerDigest.h
+++ b/src/PeerDigest.h
@@ -81,7 +81,7 @@ public:
 
     CachePeer *peer = nullptr;          /**< pointer back to peer structure, argh */
     CacheDigest *cd = nullptr;            /**< actual digest structure */
-    String host;                /**< copy of peer->host */
+    SBuf host;                        ///< copy of peer->host
     const char *req_result = nullptr;     /**< text status of the last request */
 
     struct {

diff --git a/src/peer_digest.cc b/src/peer_digest.cc
index cd693deafac52737abb07b9b5cd81354b37f3612..8dd090b0e2c94601e876971c78b353c48178f1ef 100644 (file)
--- a/src/peer_digest.cc
+++ b/src/peer_digest.cc
@@ -703,8 +703,10 @@ peerDigestSwapInMask(void *data, char *buf, ssize_t size)
 static int
 peerDigestFetchedEnough(DigestFetchState * fetch, char *buf, ssize_t size, const char *step_name)
 {
+    static const SBuf hostUnknown("<unknown>"); // peer host (if any)
+    SBuf host = hostUnknown;
+
     PeerDigest *pd = NULL;
-    const char *host = "<unknown>"; /* peer host */
     const char *reason = NULL;  /* reason for completion */
     const char *no_bug = NULL;  /* successful completion if set */
     const int pdcb_valid = cbdataReferenceValid(fetch->pd);
@@ -725,7 +727,7 @@ peerDigestFetchedEnough(DigestFetchState * fetch, char *buf, ssize_t size, const
 #endif
 
         else
-            host = pd->host.termedBuf();
+            host = pd->host;
     }
 
     debugs(72, 6, step_name << ": peer " << host << ", offset: " <<
@@ -834,8 +836,7 @@ static void
 peerDigestPDFinish(DigestFetchState * fetch, int pcb_valid, int err)
 {
     PeerDigest *pd = fetch->pd;
-    const char *host = pd->host.termedBuf();
-
+    const auto host = pd->host;
     pd->times.received = squid_curtime;
     pd->times.req_delay = fetch->resp_time;
     pd->stats.sent.kbytes += fetch->sent.bytes;
@@ -931,7 +932,7 @@ peerDigestSetCBlock(PeerDigest * pd, const char *buf)
 {
     StoreDigestCBlock cblock;
     int freed_size = 0;
-    const char *host = pd->host.termedBuf();
+    const auto host = pd->host;
 
     memcpy(&cblock, buf, sizeof(cblock));
     /* network -> host conversions */
@@ -1050,8 +1051,8 @@ peerDigestStatsReport(const PeerDigest * pd, StoreEntry * e)
 
     assert(pd);
 
-    const char *host = pd->host.termedBuf();
-    storeAppendPrintf(e, "\npeer digest from %s\n", host);
+    auto host = pd->host;
+    storeAppendPrintf(e, "\npeer digest from " SQUIDSBUFPH "\n", SQUIDSBUFPRINT(host));
 
     cacheDigestGuessStatsReport(&pd->stats.guess, e, host);
 

diff --git a/src/stat.cc b/src/stat.cc
index e8b715364710e0623df684218b6a1c638797afb1..e9e5142e434231c8c2dee320e952a639ac2c9170 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1583,7 +1583,8 @@ statPeerSelect(StoreEntry * sentry)
     const int tot_used = f->cd.times_used + f->icp.times_used;
 
     /* totals */
-    cacheDigestGuessStatsReport(&f->cd.guess, sentry, "all peers");
+    static const SBuf label("all peers");
+    cacheDigestGuessStatsReport(&f->cd.guess, sentry, label);
     /* per-peer */
     storeAppendPrintf(sentry, "\nPer-peer statistics:\n");
 

diff --git a/src/store_digest.cc b/src/store_digest.cc
index 88b4f9e6580127e2228ecbdb4e74c0159ec89b98..70684996d070796662f6c32f8fa554166f66e620 100644 (file)
--- a/src/store_digest.cc
+++ b/src/store_digest.cc
@@ -197,7 +197,8 @@ storeDigestReport(StoreEntry * e)
     }
 
     if (store_digest) {
-        cacheDigestReport(store_digest, "store", e);
+        static const SBuf label("store");
+        cacheDigestReport(store_digest, label, e);
         storeAppendPrintf(e, "\t added: %d rejected: %d ( %.2f %%) del-ed: %d\n",
                           sd_stats.add_count,
                           sd_stats.rej_count,

diff --git a/src/tests/stub_CacheDigest.cc b/src/tests/stub_CacheDigest.cc
index 8ae743ad2a72f2076cdeb0490e513345f9ec9aed..d7797b6ad2a93399b962187a4e273280d33f6a12 100644 (file)
--- a/src/tests/stub_CacheDigest.cc
+++ b/src/tests/stub_CacheDigest.cc
@@ -27,7 +27,7 @@ void CacheDigest::add(const cache_key *) STUB
 void CacheDigest::remove(const cache_key *) STUB
 double CacheDigest::usedMaskPercent() const STUB_RETVAL(0.0)
 void cacheDigestGuessStatsUpdate(CacheDigestGuessStats *, int, int) STUB
-void cacheDigestGuessStatsReport(const CacheDigestGuessStats *, StoreEntry *, const char *) STUB
-void cacheDigestReport(CacheDigest *, const char *, StoreEntry *) STUB
+void cacheDigestGuessStatsReport(const CacheDigestGuessStats *, StoreEntry *, const SBuf &) STUB
+void cacheDigestReport(CacheDigest *, const SBuf &, StoreEntry *) STUB
 uint32_t CacheDigest::CalcMaskSize(uint64_t, uint8_t) STUB_RETVAL(1)