fixed #14618 - added more metrics to timer summary / small TimerResultsData refactoring [skip ci]

Author: firewave

lib/timer.cpp

@@ -57,24 +57,26 @@ void TimerResults::showResults(ShowTime mode, bool metrics) const
 
     size_t ordinal = 1; // maybe it would be nice to have an ordinal in output later!
     for (auto iter=data.cbegin(); iter!=data.cend(); ++iter) {
-        const double sec = iter->second.getSeconds().count();
-        const double secAverage = sec / static_cast<double>(iter->second.mNumberOfResults);
         if ((mode != ShowTime::TOP5_FILE && mode != ShowTime::TOP5_SUMMARY) || (ordinal<=5)) {
+            const double sec = iter->second.getSeconds().count();
             std::cout << iter->first << ": " << sec << "s";
-            if (metrics)
-                std::cout << " (avg. " << secAverage << "s - " << iter->second.mNumberOfResults  << " result(s))";
+            if (metrics) {
+                const double secAverage = sec / static_cast<double>(iter->second.mResults.size());
+                const double secMin = asSeconds(*std::min_element(iter->second.mResults.cbegin(), iter->second.mResults.cend())).count();
+                const double secMax = asSeconds(*std::max_element(iter->second.mResults.cbegin(), iter->second.mResults.cend())).count();
+                std::cout << " (avg. " << secAverage << "s / min " << secMin << "s / max " << secMax << "s - " << iter->second.mResults.size() << " result(s))";
+            }
             std::cout << std::endl;
         }
         ++ordinal;
     }
 }
 
-void TimerResults::addResults(const std::string& str, std::chrono::milliseconds duration)
+void TimerResults::addResults(const std::string& name, std::chrono::milliseconds duration)
 {
     std::lock_guard<std::mutex> l(mResultsSync);
 
-    mResults[str].mDuration += duration;
-    mResults[str].mNumberOfResults++;
+    mResults[name].mResults.push_back(duration);
 }
 
 void TimerResults::reset()

lib/timer.h

@@ -27,8 +27,10 @@
 #include <map>
 #include <memory>
 #include <mutex>
+#include <numeric>
 #include <string>
 #include <utility>
+#include <vector>
 
 enum class ShowTime : std::uint8_t {
     NONE,
@@ -43,15 +45,20 @@ class CPPCHECKLIB TimerResultsIntf {
 public:
     virtual ~TimerResultsIntf() = default;
 
-    virtual void addResults(const std::string& timerName, std::chrono::milliseconds duation) = 0;
+    virtual void addResults(const std::string& name, std::chrono::milliseconds duration) = 0;
+
+    static std::chrono::duration<double> asSeconds(std::chrono::milliseconds ms) {
+        return std::chrono::duration_cast<std::chrono::duration<double>>(ms);
+    }
 };
 
 struct TimerResultsData {
-    std::chrono::milliseconds mDuration;
-    long mNumberOfResults{};
+    std::vector<std::chrono::milliseconds> mResults;
 
     std::chrono::duration<double> getSeconds() const {
-        return std::chrono::duration_cast<std::chrono::duration<double>>(mDuration);
+        return std::accumulate(mResults.cbegin(), mResults.cend(), std::chrono::duration<double>{}, [](std::chrono::duration<double> secs, std::chrono::milliseconds duration) {
+            return secs + TimerResultsIntf::asSeconds(duration);
+        });
     }
 };
 
@@ -60,7 +67,7 @@ class CPPCHECKLIB WARN_UNUSED TimerResults : public TimerResultsIntf {
     TimerResults() = default;
 
     void showResults(ShowTime mode, bool metrics = true) const;
-    void addResults(const std::string& str, std::chrono::milliseconds duration) override;
+    void addResults(const std::string& name, std::chrono::milliseconds duration) override;
 
     void reset();
 

test/options.cpp

@@ -60,9 +60,8 @@ options::~options()
 {
     // TODO: allow more than 5 results to be shown
     // TODO: provide higher resolution in output
-    // TODO: disable the metrics
     if (mTimerResults)
-        mTimerResults->showResults(ShowTime::TOP5_FILE);
+        mTimerResults->showResults(ShowTime::TOP5_FILE, false);
 }
 
 bool options::quiet() const

test/testtimer.cpp

@@ -33,7 +33,7 @@ class TestTimer : public TestFixture {
 
     void result() const {
         TimerResultsData t1;
-        t1.mDuration = std::chrono::milliseconds{1234};
+        t1.mResults.emplace_back(1234);
         ASSERT(t1.getSeconds().count() > 1.233 && t1.getSeconds().count() < 1.235);
 
         // TODO : more tests