Refactored StatHist::clean

diff --git a/src/StatHist.cc b/src/StatHist.cc
index 4d60b4e7f8196cfbc878138e143ba5ade8a03404..33c255fb19a6c19911f34ee88feea3cd45b282d7 100644 (file)
--- a/src/StatHist.cc
+++ b/src/StatHist.cc
@@ -94,10 +94,10 @@ statHistInit(StatHist * H, int capacity, hbase_f * val_in, hbase_f * val_out, do
 }
 
 void
-statHistClean(StatHist * H)
+StatHist::clear()
 {
-    xfree(H->bins);
-    H->bins = NULL;
+    xfree(bins);
+    bins = NULL;
 }
 
 /* assumes that somebody already called init for Dest */

diff --git a/src/StatHist.h b/src/StatHist.h
index 13ea6e7dd3ee75dde52ec8b5625f1939a8e7d1eb..7c41d39889d296f0b93509b3b5b8c8d19f551168 100644 (file)
--- a/src/StatHist.h
+++ b/src/StatHist.h
@@ -31,6 +31,8 @@
 #ifndef STATHIST_H_
 #define STATHIST_H_
 
+#include "config.h"
+
 /*
  * "very generic" histogram;
  * see important comments on hbase_f restrictions in StatHist.c
@@ -38,6 +40,7 @@
 
 class StatHist {
 public:
+    void clear();
     int *bins;
     int capacity;
     double min;
@@ -48,7 +51,6 @@ public:
 };
 
 /* StatHist */
-SQUIDCEXTERN void statHistClean(StatHist * H);
 SQUIDCEXTERN void statHistCount(StatHist * H, double val);
 SQUIDCEXTERN void statHistCopy(StatHist * Dest, const StatHist * Orig);
 SQUIDCEXTERN void statHistSafeCopy(StatHist * Dest, const StatHist * Orig);

diff --git a/src/stat.cc b/src/stat.cc
index b7d617103a325e0b4f12dbc95653085758cb9eec..3768bc737167e6b2d1ff34b62031abbc5324a632 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1515,19 +1515,19 @@ static void
 statCountersClean(StatCounters * C)
 {
     assert(C);
-    statHistClean(&C->client_http.all_svc_time);
-    statHistClean(&C->client_http.miss_svc_time);
-    statHistClean(&C->client_http.nm_svc_time);
-    statHistClean(&C->client_http.nh_svc_time);
-    statHistClean(&C->client_http.hit_svc_time);
-    statHistClean(&C->icp.query_svc_time);
-    statHistClean(&C->icp.reply_svc_time);
-    statHistClean(&C->dns.svc_time);
-    statHistClean(&C->cd.on_xition_count);
-    statHistClean(&C->comm_icp_incoming);
-    statHistClean(&C->comm_dns_incoming);
-    statHistClean(&C->comm_http_incoming);
-    statHistClean(&C->select_fds_hist);
+    C->client_http.all_svc_time.clear();
+    C->client_http.miss_svc_time.clear();
+    C->client_http.nm_svc_time.clear();
+    C->client_http.nh_svc_time.clear();
+    C->client_http.hit_svc_time.clear();
+    C->icp.query_svc_time.clear();
+    C->icp.reply_svc_time.clear();
+    C->dns.svc_time.clear();
+    C->cd.on_xition_count.clear();
+    C->comm_icp_incoming.clear();
+    C->comm_dns_incoming.clear();
+    C->comm_http_incoming.clear();
+    C->select_fds_hist.clear();
 }
 
 /* add special cases here as they arrive */