Merge pull request #18 from rizkybiz/add-count

Added the Count method

circonusllhist.go

@@ -456,6 +456,32 @@ func (h *Histogram) Mean() float64 {
 	return h.ApproxMean()
 }
 
+//Count returns the number of recorded values.
+func (h *Histogram) Count() uint64 {
+	if h.useLocks {
+		h.mutex.RLock()
+		defer h.mutex.RUnlock()
+	}
+	var count uint64
+	for _, bin := range h.bvs[0:h.used] {
+		if bin.isNaN() {
+			continue
+		}
+		count += bin.count
+	}
+	return count
+}
+
+//BinCount returns the number of used bins.
+func (h *Histogram) BinCount() uint64 {
+	if h.useLocks {
+		h.mutex.RLock()
+		defer h.mutex.RUnlock()
+	}
+	binCount := h.used
+	return uint64(binCount)
+}
+
 // Reset forgets all bins in the histogram (they remain allocated)
 func (h *Histogram) Reset() {
 	if h.useLocks {

circonusllhist_test.go

@@ -59,6 +59,41 @@ func TestSerialize(t *testing.T) {
 	}
 }
 
+func TestCount(t *testing.T) {
+	h, err := NewFromStrings([]string{
+		"H[0.0e+00]=1",
+		"H[1.0e+01]=1",
+		"H[2.0e+02]=1",
+	}, true)
+	if err != nil {
+		t.Error("could not read from strings for test")
+	}
+	if h.Count() != 3 {
+		t.Error("the count is incorrect")
+	}
+	err = h.RecordValue(10)
+	if err != nil {
+		t.Error("could not record new value to histogram")
+	}
+	if h.Count() != 4 {
+		t.Error("the count is incorrect")
+	}
+}
+
+func TestBinCount(t *testing.T) {
+	h, err := NewFromStrings([]string{
+		"H[0.0e+00]=1",
+		"H[1.0e+01]=1",
+		"H[2.0e+02]=1",
+	}, true)
+	if err != nil {
+		t.Error("could not read from strings for test")
+	}
+	if h.BinCount() != 3 {
+		t.Error("bin count is incorrect")
+	}
+}
+
 func TestJSON(t *testing.T) {
 	h, err := NewFromStrings([]string{
 		"H[0.0e+00]=1",