From 2ebbe7a41ccac13bdc88cc59fa6741db8cb13e93 Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Tue, 6 Dec 2011 06:32:23 +0100 Subject: [PATCH] Refactored StatHist::clean --- src/StatHist.cc | 6 +++--- src/StatHist.h | 4 +++- src/stat.cc | 26 +++++++++++++------------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/StatHist.cc b/src/StatHist.cc index 4d60b4e7f8..33c255fb19 100644 --- 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 13ea6e7dd3..7c41d39889 100644 --- 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 b7d617103a..3768bc7371 100644 --- 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 */ -- 2.47.3