update.

Author: cloudwebrtc

webrtc-sys/test/benchmark.cc

@@ -189,9 +189,11 @@ void Benchmark::Perform() {
             uint32_t cpuUsage = _cpu->CpuUsage();
             if (cpuUsage > 0) {
               currCpuUsage += cpuUsage;
-              std::string str = "CPU Usage[%]:";
-              str += " " + std::to_string(cpuUsage) + "%" +
-                     ", Iteration: " + std::to_string(l + 1);
+              int coreCount = _cpu->GetNumCores();
+              std::string str = "CPU Usage[%]: cores ";
+              str += std::to_string(coreCount);
+              str += ", usage " + std::to_string(cpuUsage) + "%" +
+                     ", Test Iteration: " + std::to_string(l + 1) + "/" + std::to_string(testIterations);
               std::cout << str << std::flush;
               for (int i = 0; i < str.length(); ++i) {
                 std::cout << "\b";

webrtc-sys/test/cpu/cpu_linux.h

@@ -28,12 +28,14 @@ class CpuLinux : public CpuWrapper {
   void Reset() override { return; }
   void Stop() override { return; }
 
+  int GetNumCores() override;
+
  private:
   int GetData(long long& busy,
               long long& idle,
               long long*& busyArray,
               long long*& idleArray);
-  int GetNumCores();
+  
 
   long long m_oldBusyTime;
   long long m_oldIdleTime;

webrtc-sys/test/cpu/cpu_wrapper.h

@@ -46,6 +46,8 @@ class CpuWrapper
     virtual void Reset() = 0;
     virtual void Stop() = 0;
 
+    virtual int GetNumCores() = 0;
+
 protected:
     CpuWrapper() {}
 };