Merge multiple histogram snapshots into single one for reporting.

base/metrics/histogram_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/metrics/histogram.h"
 
 #include <limits.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 11 matching lines @@
 #include "base/metrics/statistics_recorder.h"
 #include "base/pickle.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/time/time.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
 class HistogramTest : public testing::Test {
+ public:
+  HistogramTest() {}
+  ~HistogramTest() override {}
+
  protected:
   const int32_t kAllocatorMemorySize = 64 << 10;  // 64 KiB
 
-  HistogramTest() {}
-
   void SetUp() override {
     // Each test will have a clean state (no Histogram / BucketRanges
     // registered).
     InitializeStatisticsRecorder();
     // By getting the results-histogram before any persistent allocator
     // is attached, that histogram is guaranteed not to be stored in
     // any persistent memory segment (which simplifies some tests).
     GetCreateHistogramResultHistogram();
   }
 
   void TearDown() override {
     UninitializeStatisticsRecorder();
     DestroyPersistentMemoryAllocator();
   }
 
   void InitializeStatisticsRecorder() {
+    StatisticsRecorder::ResetForTesting();
     statistics_recorder_ = new StatisticsRecorder();
   }
 
   void UninitializeStatisticsRecorder() {
     delete statistics_recorder_;
     statistics_recorder_ = NULL;
   }
 
   void CreatePersistentMemoryAllocator() {
     if (!allocator_memory_)
@@ skipping 14 matching lines @@
   }
 
   StatisticsRecorder* statistics_recorder_;
   scoped_ptr<char[]> allocator_memory_;
   PersistentMemoryAllocator* allocator_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HistogramTest);
 };
 
+class AllocatorHistogramTest : public HistogramTest,
+                               public testing::WithParamInterface<bool> {
+ public:
+  AllocatorHistogramTest() {
+    if (GetParam())
+      CreatePersistentMemoryAllocator();
+  }
+  ~AllocatorHistogramTest() override {}
+};
+
+// Run all AllocatorHistogramTest cases with both heap and persistent memory.
+INSTANTIATE_TEST_CASE_P(HeapAndPersistent, AllocatorHistogramTest,
+                        testing::Values(false, true));
+
+
 // Check for basic syntax and use.
 TEST_F(HistogramTest, BasicTest) {
   // Try basic construction
   HistogramBase* histogram = Histogram::FactoryGet(
       "TestHistogram", 1, 1000, 10, HistogramBase::kNoFlags);
   EXPECT_TRUE(histogram);
 
   HistogramBase* linear_histogram = LinearHistogram::FactoryGet(
       "TestLinearHistogram", 1, 1000, 10, HistogramBase::kNoFlags);
   EXPECT_TRUE(linear_histogram);
@@ skipping 104 matching lines @@
   LOCAL_HISTOGRAM_PERCENTAGE("DuplicatedHistogram", 10);
   LOCAL_HISTOGRAM_PERCENTAGE("DuplicatedHistogram", 10);
   HistogramBase* histogram = LinearHistogram::FactoryGet(
       "DuplicatedHistogram", 1, 101, 102, HistogramBase::kNoFlags);
 
   scoped_ptr<HistogramSamples> samples = histogram->SnapshotSamples();
   EXPECT_EQ(2, samples->TotalCount());
   EXPECT_EQ(2, samples->GetCount(10));
 }
 
+// Check that delta calculations work correct.
+TEST_P(AllocatorHistogramTest, DeltaTest) {
+  HistogramBase* histogram =
+      Histogram::FactoryGet("DeltaHistogram", 1, 64, 8,
+                            HistogramBase::kNoFlags);
+  histogram->Add(1);
+  histogram->Add(10);
+  histogram->Add(50);
+
+  scoped_ptr<HistogramSamples> samples = histogram->SnapshotDelta();
+  EXPECT_EQ(3, samples->TotalCount());
+  EXPECT_EQ(1, samples->GetCount(1));
+  EXPECT_EQ(1, samples->GetCount(10));
+  EXPECT_EQ(1, samples->GetCount(50));
+  EXPECT_EQ(samples->TotalCount(), samples->redundant_count());
+
+  samples = histogram->SnapshotDelta();
+  EXPECT_EQ(0, samples->TotalCount());
+
+  histogram->Add(10);
+  histogram->Add(10);
+  samples = histogram->SnapshotDelta();
+  EXPECT_EQ(2, samples->TotalCount());
+  EXPECT_EQ(2, samples->GetCount(10));
+
+  samples = histogram->SnapshotDelta();
+  EXPECT_EQ(0, samples->TotalCount());
+}
+
 TEST_F(HistogramTest, ExponentialRangesTest) {
   // Check that we got a nice exponential when there was enough room.
   BucketRanges ranges(9);
   Histogram::InitializeBucketRanges(1, 64, &ranges);
   EXPECT_EQ(0, ranges.range(0));
   int power_of_2 = 1;
   for (int i = 1; i < 8; i++) {
     EXPECT_EQ(power_of_2, ranges.range(i));
     power_of_2 *= 2;
   }
@@ skipping 292 matching lines @@
       const_cast<BucketRanges*>(histogram->bucket_ranges());
   HistogramBase::Sample tmp = bucket_ranges->range(1);
   bucket_ranges->set_range(1, bucket_ranges->range(2));
   bucket_ranges->set_range(2, tmp);
   EXPECT_EQ(
       HistogramBase::BUCKET_ORDER_ERROR | HistogramBase::RANGE_CHECKSUM_ERROR,
       histogram->FindCorruption(*snapshot));
 
   bucket_ranges->set_range(2, bucket_ranges->range(1));
   bucket_ranges->set_range(1, tmp);
-  EXPECT_EQ(0, histogram->FindCorruption(*snapshot));
+  EXPECT_EQ(0U, histogram->FindCorruption(*snapshot));
 
   // Show that two simple changes don't offset each other
   bucket_ranges->set_range(3, bucket_ranges->range(3) + 1);
   EXPECT_EQ(HistogramBase::RANGE_CHECKSUM_ERROR,
             histogram->FindCorruption(*snapshot));
 
   bucket_ranges->set_range(4, bucket_ranges->range(4) - 1);
   EXPECT_EQ(HistogramBase::RANGE_CHECKSUM_ERROR,
             histogram->FindCorruption(*snapshot));
 
@@ skipping 190 matching lines @@
   // CustomHistogram needs at least 1 valid range.
   custom_ranges.clear();
   custom_ranges.push_back(0);
   EXPECT_DEATH(CustomHistogram::FactoryGet("BadRangesCustom3", custom_ranges,
                                            HistogramBase::kNoFlags),
                "");
 }
 #endif
 
 }  // namespace base