Ensure CPU sampling is happening always.

We weren't actually sampling at all when "short output"
was enabled.

Author: gbrail

src/apib_main.cc

@@ -257,7 +257,9 @@ static void waitAndReport(const apib::ThreadList &threads, int duration,
     }
 
     sleep(toSleep);
-    if (!ShortOutput) {
+    if (ShortOutput) {
+      apib::SampleCPU();
+    } else {
       ReportInterval(std::cout, threads, duration, warmup);
     }
     durationLeft -= toSleep;

src/apib_reporting.cc

@@ -226,8 +226,8 @@ void RecordStart(bool startReporting, const ThreadList& threads) {
 }
 
 void RecordStop(const ThreadList& threads) {
+  SampleCPU();
   clientMem = cpu_GetMemoryUsage();
-
   if (remoteCpuSocket != 0) {
     remoteMem = getRemoteStat(kMemCmd, &remoteCpuSocket);
   }
@@ -275,6 +275,19 @@ BenchmarkIntervalResults ReportIntervalResults(const ThreadList& threads) {
   return r;
 }
 
+void SampleCPU() {
+  if (remoteCpuSocket != 0) {
+    const double remoteCpu = getRemoteStat(kCPUCmd, &remoteCpuSocket);
+    remoteSamples.push_back(remoteCpu);
+  }
+  if (remote2CpuSocket != 0) {
+    const double remote2Cpu = getRemoteStat(kCPUCmd, &remote2CpuSocket);
+    remote2Samples.push_back(remote2Cpu);
+  }
+  const double cpu = cpu_GetInterval(&cpuUsage);
+  clientSamples.push_back(cpu);
+}
+
 void ReportInterval(std::ostream& out, const ThreadList& threads,
                     int totalDuration, bool warmup) {
   double cpu = 0.0;

src/apib_reporting.h

@@ -103,6 +103,10 @@ extern void PrintFullResults(std::ostream& out);
 // Call ReportIntervalResults and print to a file
 extern void ReportInterval(std::ostream& out, const ThreadList& threads,
                            int totalDuration, bool warmup);
+// If ReportInterval is not being called, call this instead to ensure
+// that the CPU samples are happening regularly so
+// that we get a good average.
+extern void SampleCPU();
 // Print a CSV header for the "short" reporting format
 extern void PrintReportingHeader(std::ostream& out);