Rework + test fix

Author: olabetskyi

cli/cppcheckexecutor.cpp

@@ -409,7 +409,7 @@ namespace {
 
 int CppCheckExecutor::check(int argc, const char* const argv[])
 {
-    WholeProgramTimer timer;
+    auto startTime{Timer::now()};
     Settings settings;
     CmdLineLoggerStd logger;
     Suppressions supprs;
@@ -421,16 +421,16 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
         return EXIT_SUCCESS;
     }
 
-    if (settings.showtime == SHOWTIME_MODES::SHOWTIME_NONE)
-        timer.cancell();
-
     settings.loadSummaries();
 
     mFiles = parser.getFiles();
     mFileSettings = parser.getFileSettings();
 
     const int ret = check_wrapper(settings, supprs);
 
+    if (settings.showtime != SHOWTIME_MODES::SHOWTIME_NONE)
+        Timer::calculateAndOutputTimeDiff(startTime, Timer::now());
+
     return ret;
 }
 

lib/timer.cpp

@@ -140,17 +140,9 @@ void Timer::stop()
     mStopped = true;
 }
 
-WholeProgramTimer::~WholeProgramTimer()
+void Timer::calculateAndOutputTimeDiff(const std::chrono::system_clock::time_point& start, const std::chrono::system_clock::time_point& end)
 {
-    stop();
-}
-
-void WholeProgramTimer::stop()
-{
-    if (mCancelled)
-        return;
-    const auto end = std::chrono::high_resolution_clock::now();
-    auto diff = std::chrono::duration_cast<std::chrono::microseconds>(end - mStart);
+    auto diff = std::chrono::duration_cast<std::chrono::microseconds>(end - start);
 
     // Extract hours
     auto hours = std::chrono::duration_cast<std::chrono::hours>(diff);

lib/timer.h

@@ -79,6 +79,12 @@ class CPPCHECKLIB Timer {
     Timer(const Timer&) = delete;
     Timer& operator=(const Timer&) = delete;
 
+    static std::chrono::system_clock::time_point now() {
+        return std::chrono::high_resolution_clock::now();
+    }
+
+    static void calculateAndOutputTimeDiff(const std::chrono::system_clock::time_point& start, const std::chrono::system_clock::time_point& end);
+
     void stop();
 
     static void run(std::string str, SHOWTIME_MODES showtimeMode, TimerResultsIntf* timerResults, const std::function<void()>& f) {
@@ -94,21 +100,5 @@ class CPPCHECKLIB Timer {
     bool mStopped{};
 };
 
-class CPPCHECKLIB WholeProgramTimer {
-public:
-    WholeProgramTimer()
-        : mStart(std::chrono::high_resolution_clock::now())
-    {}
-    ~WholeProgramTimer();
-
-    void stop();
-
-    void cancell() {
-        mCancelled = true;
-    }
-private:
-    std::chrono::system_clock::time_point mStart;
-    bool mCancelled{false};
-};
 //---------------------------------------------------------------------------
 #endif // timerH

test/testprocessexecutor.cpp

@@ -248,7 +248,7 @@ class TestProcessExecutorBase : public TestFixture {
                     $.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY));
         const std::string output_s = GET_REDIRECT_OUTPUT;
         // once: top5 results + overall + empty line
-        TODO_ASSERT_EQUALS(5 + 1 + 1, 2, cppcheck::count_all_of(output_s, '\n'));
+        TODO_ASSERT_EQUALS(5 + 1 + 1, 1, cppcheck::count_all_of(output_s, '\n'));
         // should only report the top5 once
         ASSERT(output_s.find("1 result(s)") == std::string::npos);
         TODO_ASSERT(output_s.find("2 result(s)") != std::string::npos);