Add global timer

Author: olabetskyi

Makefile

@@ -683,7 +683,7 @@ frontend/frontend.o: frontend/frontend.cpp frontend/frontend.h lib/addoninfo.h l
 cli/cmdlineparser.o: cli/cmdlineparser.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/filelister.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/importproject.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/regex.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h lib/xml.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cmdlineparser.cpp
 
-cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/sehwrapper.h cli/signalhandler.h cli/singleexecutor.h cli/threadexecutor.h externals/picojson/picojson.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h
+cli/cppcheckexecutor.o: cli/cppcheckexecutor.cpp cli/cmdlinelogger.h cli/cmdlineparser.h cli/cppcheckexecutor.h cli/executor.h cli/processexecutor.h cli/sehwrapper.h cli/signalhandler.h cli/singleexecutor.h cli/threadexecutor.h externals/picojson/picojson.h lib/addoninfo.h lib/analyzerinfo.h lib/check.h lib/checkers.h lib/checkersreport.h lib/color.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.h lib/json.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/timer.h lib/utils.h
 	$(CXX) ${INCLUDE_FOR_CLI} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ cli/cppcheckexecutor.cpp
 
 cli/executor.o: cli/executor.cpp cli/executor.h lib/addoninfo.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/utils.h

cli/cppcheckexecutor.cpp

@@ -37,6 +37,7 @@
 #include "settings.h"
 #include "singleexecutor.h"
 #include "suppressions.h"
+#include "timer.h"
 #include "utils.h"
 
 #if defined(HAS_THREADING_MODEL_THREAD)
@@ -408,6 +409,7 @@ namespace {
 
 int CppCheckExecutor::check(int argc, const char* const argv[])
 {
+    WholeProgramTimer timer;
     Settings settings;
     CmdLineLoggerStd logger;
     Suppressions supprs;
@@ -419,6 +421,9 @@ 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();

lib/timer.cpp

@@ -83,9 +83,6 @@ void TimerResults::showResults(SHOWTIME_MODES mode) const
         }
         ++ordinal;
     }
-
-    const double secOverall = overallData.seconds();
-    std::cout << "Overall time: " << secOverall << "s" << std::endl;
 }
 
 void TimerResults::addResults(const std::string& str, std::clock_t clocks)
@@ -142,3 +139,37 @@ void Timer::stop()
 
     mStopped = true;
 }
+
+WholeProgramTimer::~WholeProgramTimer()
+{
+    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);
+
+    // Extract hours
+    auto hours = std::chrono::duration_cast<std::chrono::hours>(diff);
+    diff -= hours; // Subtract the extracted hours
+
+    // Extract minutes
+    auto minutes = std::chrono::duration_cast<std::chrono::minutes>(diff);
+    diff -= minutes; // Subtract the extracted minutes
+
+    // Extract seconds
+    auto seconds = static_cast<double>(diff.count()) / std::chrono::microseconds::period::den;
+
+    std::string ellapsedTime;
+    if (hours.count() > 0)
+        ellapsedTime += std::to_string(hours.count()) + "h ";
+    if (minutes.count() > 0)
+        ellapsedTime += std::to_string(minutes.count()) + "m ";
+    ellapsedTime += std::to_string(seconds) + "s ";
+
+    std::lock_guard<std::mutex> l(stdCoutLock);
+    std::cout << "Overall time: " << ellapsedTime << std::endl;
+}

lib/timer.h

@@ -93,5 +93,22 @@ class CPPCHECKLIB Timer {
     const SHOWTIME_MODES mShowTimeMode = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL;
     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