refs #14599 - moved some ShowTime logic out of TimerResults

Author: firewave

cli/cppcheckexecutor.cpp

@@ -56,6 +56,7 @@
 #include <iostream>
 #include <list>
 #include <map>
+#include <memory>
 #include <set>
 #include <sstream>
 #include <unordered_set>
@@ -464,8 +465,10 @@ int CppCheckExecutor::check_internal(const Settings& settings, Suppressions& sup
     }
 
     // TODO: show time *after* the whole program analysis
-    if (settings.showtime == ShowTime::SUMMARY || settings.showtime == ShowTime::TOP5_SUMMARY)
-        timerResults.showResults(settings.showtime);
+    if (settings.showtime == ShowTime::SUMMARY)
+        timerResults.showResults();
+    else if (settings.showtime == ShowTime::TOP5_SUMMARY)
+        timerResults.showResults(5);
 
     // TODO: is this run again instead of using previously cached results?
     returnValue |= cppcheck.analyseWholeProgram(settings.buildDir, mFiles, mFileSettings, stdLogger.getCtuInfo());

lib/cppcheck.cpp

@@ -1294,8 +1294,12 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
     // TODO: clear earlier?
     mLogger->clear();
 
-    if (mTimerResults && (mSettings.showtime == ShowTime::FILE || mSettings.showtime == ShowTime::TOP5_FILE))
-        mTimerResults->showResults(mSettings.showtime);
+    if (mTimerResults) {
+        if (mSettings.showtime == ShowTime::FILE)
+            mTimerResults->showResults();
+        else if (mSettings.showtime == ShowTime::TOP5_FILE)
+            mTimerResults->showResults(5);
+    }
 
     return mLogger->exitcode();
 }

lib/timer.cpp

@@ -19,7 +19,6 @@
 #include "timer.h"
 
 #include <algorithm>
-#include <cstddef>
 #include <iostream>
 #include <utility>
 #include <vector>
@@ -37,12 +36,9 @@ namespace {
 
 // TODO: this does not include any file context when SHOWTIME_FILE thus rendering it useless - should we include the logging with the progress logging?
 // that could also get rid of the broader locking
-void TimerResults::showResults(ShowTime mode, bool metrics) const
+void TimerResults::showResults(size_t max_results, bool metrics) const
 {
-    if (mode == ShowTime::NONE)
-        return;
     std::vector<dataElementType> data;
-
     {
         std::lock_guard<std::mutex> l(mResultsSync);
 
@@ -56,7 +52,7 @@ 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) {
-        if ((mode != ShowTime::TOP5_FILE && mode != ShowTime::TOP5_SUMMARY) || (ordinal<=5)) {
+        if (ordinal <= max_results) {
             const double sec = iter->second.getSeconds().count();
             std::cout << iter->first << ": " << sec << "s";
             if (metrics) {

lib/timer.h

@@ -23,7 +23,9 @@
 #include "config.h"
 
 #include <chrono>
+#include <cstddef>
 #include <cstdint>
+#include <limits>
 #include <map>
 #include <memory>
 #include <mutex>
@@ -66,7 +68,7 @@ class CPPCHECKLIB WARN_UNUSED TimerResults : public TimerResultsIntf {
 public:
     TimerResults() = default;
 
-    void showResults(ShowTime mode, bool metrics = true) const;
+    void showResults(size_t max_results = std::numeric_limits<size_t>::max(), bool metrics = true) const;
     void addResults(const std::string& name, std::chrono::milliseconds duration) override;
 
     void reset();

test/options.cpp

@@ -58,9 +58,8 @@ options::options(int argc, const char* const argv[])
 
 options::~options()
 {
-    // TODO: allow more than 5 results to be shown
     if (mTimerResults)
-        mTimerResults->showResults(ShowTime::TOP5_FILE, false);
+        mTimerResults->showResults(10, false);
 }
 
 bool options::quiet() const