From: Francesco Chemolli <kinkie@squid-cache.org>
Date: Tue, 13 Dec 2011 18:24:47 +0000 (+0100)
Subject: Implemented proper distructor for StatHist
X-Git-Tag: BumpSslServerFirst.take05~12^2~120^2~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2a38d23132d18ce990c16b10d866066df1706c11;p=thirdparty%2Fsquid.git

Implemented proper distructor for StatHist
Started to add some documentation for StatHist.
Removed includes of config.h from header files.
---

diff --git a/src/StatCounters.h b/src/StatCounters.h
index 4e57e70955..c5f64f7933 100644
--- a/src/StatCounters.h
+++ b/src/StatCounters.h
@@ -31,8 +31,6 @@
 #ifndef STATCOUNTERS_H_
 #define STATCOUNTERS_H_
 
-#include "config.h"
-
 #include "StatHist.h"
 
 #if USE_CACHE_DIGESTS
diff --git a/src/StatHist.cc b/src/StatHist.cc
index 7dd385e8cb..c857de3b73 100644
--- a/src/StatHist.cc
+++ b/src/StatHist.cc
@@ -87,8 +87,16 @@ StatHist::init(int capacity_, hbase_f * val_in_, hbase_f * val_out_, double min_
 void
 StatHist::clear()
 {
-    xfree(bins);
-    bins = NULL;
+    for(int i=0;i<capacity;++i)
+        bins[i]=0;
+}
+
+StatHist::~StatHist()
+{
+    if (bins != NULL) {
+        xfree(bins);
+        bins = NULL;
+    }
 }
 
 /* assumes that somebody already called init for Dest */
@@ -288,3 +296,4 @@ statHistIntDumper(StoreEntry * sentry, int idx, double val, double size, int cou
     if (count)
         storeAppendPrintf(sentry, "%9d\t%9d\n", (int) val, count);
 }
+
diff --git a/src/StatHist.h b/src/StatHist.h
index 3ff4bfd926..edbbbf67ee 100644
--- a/src/StatHist.h
+++ b/src/StatHist.h
@@ -33,20 +33,31 @@
 
 #include "typedefs.h"
 
-/*
- * "very generic" histogram;
+/** Generic histogram class
+ *
  * see important comments on hbase_f restrictions in StatHist.c
  */
-
 class StatHist {
 public:
+    /** Default constructor
+     *
+     * \note the default constructor doesn't fully initialize.
+     *       you have to call one of the *init functions to specialize the
+     *       histogram
+     * \todo specialize the class in a small hierarchy so that all
+     *       relevant initializations are done at build-time
+     */
+    StatHist() : scale(1.0) {};
+    StatHist(const StatHist&);
+    StatHist &operator=(const StatHist &);
+    virtual ~StatHist();
+    /**
+     *
+     */
     void clear();
     double deltaPctile(const StatHist &B, double pctile) const;
-    double val(int bin) const; //todo: make private
+    double val(int bin) const;
     void count(double val);
-    StatHist &operator=(const StatHist &);
-    StatHist() : scale(1.0) {};
-    StatHist(const StatHist&);
     void dump(StoreEntry *sentry, StatHistBinDumper * bd) const;
     void logInit(int capacity, double min, double max);
     void enumInit(int last_enum);
@@ -67,7 +78,6 @@ protected:
 void statHistCount(StatHist * H, double val);
 double statHistDeltaMedian(const StatHist & A, const StatHist & B);
 double statHistDeltaPctile(const StatHist & A, const StatHist & B, double pctile);
-//void statHistIntInit(StatHist * H, int n);
 StatHistBinDumper statHistEnumDumper;
 StatHistBinDumper statHistIntDumper;