SOme more changes

Author: olabetskyi

cli/cppcheckexecutor.cpp

@@ -271,7 +271,7 @@ int CppCheckExecutor::check(int argc, const char* const argv[])
         return EXIT_SUCCESS;
     }
 
-    Timer realTimeClock(Timer::OVERALL, settings.showtime);
+    Timer realTimeClock("", settings.showtime, nullptr, Timer::Type::OVERALL);
 
     settings.loadSummaries();
 

lib/cppcheck.cpp

@@ -895,7 +895,7 @@ unsigned int CppCheck::checkInternal(const FileWithDetails& file, const std::str
     if (Settings::terminated())
         return mLogger->exitcode();
 
-    const Timer fileTotalTimer{file.spath(), mSettings.showtime};
+    const Timer fileTotalTimer{file.spath(), mSettings.showtime, nullptr, Timer::Type::FILE};
 
     if (!mSettings.quiet) {
         std::string fixedpath = Path::toNativeSeparators(file.spath());

lib/timer.cpp

@@ -25,8 +25,6 @@
 #include <utility>
 #include <vector>
 
-constexpr char Timer::OVERALL[];
-
 namespace {
     using dataElementType = std::pair<std::string, TimerResultsData>;
     bool more_second_sec(const dataElementType& lhs, const dataElementType& rhs)
@@ -84,11 +82,12 @@ void TimerResults::reset()
     mResults.clear();
 }
 
-Timer::Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults)
-    : mStr(std::move(str))
-    , mTimerResults(timerResults)
-    , mShowTimeMode(showtimeMode)
-    , mStartTimePoint(Clock::now())
+Timer::Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults, Type type)
+    : mName(std::move(str))
+    , mMode(showtimeMode)
+    , mType(type)
+    , mStart(Clock::now())
+    , mResults(timerResults)
 {}
 
 Timer::~Timer()
@@ -98,22 +97,26 @@ Timer::~Timer()
 
 void Timer::stop()
 {
-    if ((mShowTimeMode != ShowTime::NONE) && mStartTimePoint != TimePoint{}) {
-        auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - mStartTimePoint);
-        if (!mTimerResults) {
-            if (mStr == OVERALL
-                && (mShowTimeMode != ShowTime::TOP5_SUMMARY && mShowTimeMode != ShowTime::TOP5_FILE && mShowTimeMode != ShowTime::SUMMARY))
-                return;
-            if (mStr != OVERALL
-                && (mShowTimeMode != ShowTime::FILE && mShowTimeMode != ShowTime::FILE_TOTAL))
-                return;
+    if (mMode == ShowTime::NONE)
+        return;
+    if (mType == Type::OVERALL && mMode != ShowTime::TOP5_SUMMARY && mMode != ShowTime::SUMMARY) {
+        mMode = ShowTime::NONE;
+        return;
+    }
+    if (mType == Type::FILE && mMode != ShowTime::TOP5_FILE && mMode != ShowTime::FILE && mMode != ShowTime::FILE_TOTAL) {
+        mMode = ShowTime::NONE;
+        return;
+    }
+    if (mStart != TimePoint{}) {
+        auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - mStart);
+        if (!mResults) {
             std::lock_guard<std::mutex> l(stdCoutLock);
-            std::cout << (mStr == OVERALL ? "Overall time: " : "Check time: " + mStr + ": ")<< TimerResultsData::durationToString(diff) << std::endl;
+            std::cout << (mType == Type::OVERALL ? "Overall time: " : "Check time: " + mName + ": ") << TimerResultsData::durationToString(diff) << std::endl;
         } else {
-            mTimerResults->addResults(mStr, diff);
+            mResults->addResults(mName, diff);
         }
     }
-    mShowTimeMode = ShowTime::NONE; // prevent multiple stops
+    mMode = ShowTime::NONE; // prevent multiple stops
 }
 
 std::string TimerResultsData::durationToString(std::chrono::milliseconds duration)

lib/timer.h

@@ -74,11 +74,16 @@ class CPPCHECKLIB TimerResults : public TimerResultsIntf {
 
 class CPPCHECKLIB Timer {
 public:
-    static constexpr char OVERALL[] = "Summary";
     using Clock = std::chrono::high_resolution_clock;
     using TimePoint = std::chrono::time_point<Clock>;
 
-    Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults = nullptr);
+    enum class Type : std::uint8_t {
+        FILE,
+        OVERALL,
+        OTHER
+    };
+
+    Timer(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults = nullptr, Type type = Type::OTHER);
     ~Timer();
 
     Timer(const Timer&) = delete;
@@ -92,10 +97,11 @@ class CPPCHECKLIB Timer {
     }
 
 private:
-    const std::string mStr;
-    TimerResultsIntf* mTimerResults{};
-    ShowTime mShowTimeMode = ShowTime::FILE_TOTAL;
-    TimePoint mStartTimePoint;
+    const std::string mName;
+    ShowTime mMode{};
+    Type mType{};
+    TimePoint mStart;
+    TimerResultsIntf* mResults{};
 };
 
 //---------------------------------------------------------------------------

test/testsingleexecutor.cpp

@@ -242,8 +242,8 @@ class TestSingleExecutorBase : public TestFixture {
               dinit(CheckOptions,
                     $.showtime = ShowTime::TOP5_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + overall
-        ASSERT_EQUALS((5 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
+        // for each file: top5 results + overall + total
+        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_top5_summary() {
@@ -253,7 +253,7 @@ class TestSingleExecutorBase : public TestFixture {
               dinit(CheckOptions,
                     $.showtime = ShowTime::TOP5_SUMMARY));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + overall
+        // once: top5 results + newline
         ASSERT_EQUALS(5 + 1, cppcheck::count_all_of(output_s, '\n'));
         // should only report the top5 once
         ASSERT(output_s.find("1 result(s)") == std::string::npos);

test/testthreadexecutor.cpp

@@ -234,8 +234,8 @@ class TestThreadExecutorBase : public TestFixture {
               dinit(CheckOptions,
                     $.showtime = ShowTime::TOP5_FILE));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // for each file: top5 results + overall
-        ASSERT_EQUALS((5 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
+        // for each file: top5 results + newline + overall
+        ASSERT_EQUALS((5 + 1 + 1) * 2LL, cppcheck::count_all_of(output_s, '\n'));
     }
 
     void showtime_top5_summary() {
@@ -245,7 +245,7 @@ class TestThreadExecutorBase : public TestFixture {
               dinit(CheckOptions,
                     $.showtime = ShowTime::TOP5_SUMMARY));
         const std::string output_s = GET_REDIRECT_OUTPUT;
-        // once: top5 results + overall
+        // once: top5 results + newline
         ASSERT_EQUALS(5 + 1, cppcheck::count_all_of(output_s, '\n'));
         // should only report the top5 once
         ASSERT(output_s.find("1 result(s)") == std::string::npos);