change is_valid to memory_iterations

Author: EfesX

include/benchmark/benchmark.h

@@ -306,6 +306,8 @@ namespace benchmark {
 class BenchmarkReporter;
 class State;
 
+typedef int64_t IterationCount;
+
 // Define alias of Setup/Teardown callback function type
 using callback_function = std::function<void(const benchmark::State&)>;
 
@@ -395,7 +397,7 @@ class MemoryManager {
           max_bytes_used(0),
           total_allocated_bytes(TombstoneValue),
           net_heap_growth(TombstoneValue),
-          is_valid(false) {}
+          memory_iterations(0) {}
 
     // The number of allocations made in total between Start and Stop.
     int64_t num_allocs;
@@ -412,7 +414,7 @@ class MemoryManager {
     // Init'ed to TombstoneValue if metric not available.
     int64_t net_heap_growth;
 
-    bool is_valid;
+    IterationCount memory_iterations;
   };
 
   virtual ~MemoryManager() {}
@@ -662,8 +664,6 @@ enum BigO { oNone, o1, oN, oNSquared, oNCubed, oLogN, oNLogN, oAuto, oLambda };
 
 typedef int64_t ComplexityN;
 
-typedef int64_t IterationCount;
-
 enum StatisticUnit { kTime, kPercentage };
 
 // BigOFunc is passed to a benchmark in order to specify the asymptotic

src/benchmark_runner.cc

@@ -114,7 +114,6 @@ BenchmarkReporter::Run CreateRunReport(
     report.counters = results.counters;
 
     if (memory_iterations > 0) {
-      assert(memory_result.is_valid);
       report.memory_result = memory_result;
       report.allocs_per_iter =
           memory_iterations != 0
@@ -440,6 +439,7 @@ MemoryManager::Result BenchmarkRunner::RunMemoryManager(
   b.Teardown();
   MemoryManager::Result memory_result;
   memory_manager->Stop(memory_result);
+  memory_result.memory_iterations = memory_iterations;
   return memory_result;
 }
 
@@ -511,7 +511,6 @@ void BenchmarkRunner::DoOneRepetition() {
     // allocations in benchmarks that are not properly managed.
     memory_iterations = std::min<IterationCount>(16, iters);
     memory_result = RunMemoryManager(memory_iterations);
-    memory_result.is_valid = true;
   }
 
   if (profiler_manager != nullptr) {

src/json_reporter.cc

@@ -306,7 +306,7 @@ void JSONReporter::PrintRunData(Run const& run) {
     out << ",\n" << indent << FormatKV(c.first, c.second);
   }
 
-  if (run.memory_result.is_valid) {
+  if (run.memory_result.memory_iterations > 0) {
     const MemoryManager::Result& memory_result{run.memory_result};
     out << ",\n" << indent << FormatKV("allocs_per_iter", run.allocs_per_iter);
     out << ",\n"

test/memory_results_gtest.cc

@@ -53,7 +53,7 @@ class TestReporter : public ConsoleReporter {
   void PrintHeader(const Run&) override {}
   void PrintRunData(const Run& run) override {
     if (run.repetition_index == -1) return;
-    if (!run.memory_result.is_valid) return;
+    if (!run.memory_result.memory_iterations) return;
 
     store.push_back(run.memory_result);
   }