deprecated --showtime=top5 and introduced the modes top5_file and top5_summary / temporarily disabled collecting of timing information in daca / removed test_showtimetop5.sh

firewave · firewave · commit 9970e3afd68f · 2023-03-10T09:30:34.000+01:00
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
@@ -362,10 +362,6 @@ jobs:
         env:
           STRICT: 1
 
-      - name: Run showtimetop5 tests
-        run: |
-          ./tools/test_showtimetop5.sh
-
       - name: Run --dump test
         run: |
           ./cppcheck test/testpreprocessor.cpp --dump
@@ -446,7 +442,7 @@ jobs:
 
       - name: Self check
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5_summary -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
           ec=0
           
           # early exit
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -72,7 +72,7 @@ jobs:
       - name: Self check
         if: false
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5_summary -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
           ec=0
           ./cmake.output/bin/cppcheck $selfcheck_options --addon=naming.json -DCHECK_INTERNAL cli lib || ec=1
           ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
diff --git a/.github/workflows/tsan.yml b/.github/workflows/tsan.yml
@@ -58,7 +58,7 @@ jobs:
       - name: Self check
         if: false
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ --error-exitcode=0 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5_summary -D__CPPCHECK__ --error-exitcode=0 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
           ec=0
           ./cmake.output/bin/cppcheck $selfcheck_options --addon=naming.json -DCHECK_INTERNAL cli lib || ec=1
           ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 --library=qt --addon=naming.json -Igui/temp -Igui gui/*.cpp gui/temp/*.cpp || ec=1
diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml
@@ -70,7 +70,7 @@ jobs:
       # TODO: only fail the step on sanitizer issues
       - name: Self check
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
+          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5_summary -D__CPPCHECK__ --error-exitcode=1 --inline-suppr --suppressions-list=.selfcheck_suppressions --library=cppcheck-lib -Ilib -Iexternals/simplecpp/ -Iexternals/tinyxml2/ --inconclusive --enable=style,performance,portability,warning,missingInclude,internal --exception-handling --debug-warnings"
           ec=0
           ./cmake.output/bin/cppcheck $selfcheck_options --addon=naming.json -DCHECK_INTERNAL cli lib || ec=1
           ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
diff --git a/cli/cmdlineparser.cpp b/cli/cmdlineparser.cpp
@@ -814,12 +814,22 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                     mSettings.showtime = SHOWTIME_MODES::SHOWTIME_FILE;
                 else if (showtimeMode == "summary")
                     mSettings.showtime = SHOWTIME_MODES::SHOWTIME_SUMMARY;
-                else if (showtimeMode == "top5")
-                    mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5;
-                else if (showtimeMode.empty())
+                else if (showtimeMode == "top5") {
+                    mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE;
+                    printMessage("--showtime=top5 is deprecated and will be removed in Cppcheck 2.13. Please use --showtime=top5_file or --showtime=top5_summary instead.");
+                }
+                else if (showtimeMode == "top5_file")
+                    mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_FILE;
+                else if (showtimeMode == "top5_summary")
+                    mSettings.showtime = SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY;
+                else if (showtimeMode == "none")
                     mSettings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+                else if (showtimeMode.empty()) {
+                    printError("no mode provided for --showtime");
+                    return false;
+                }
                 else {
-                    printError("unrecognized showtime mode: \"" + showtimeMode + "\". Supported modes: file, summary, top5.");
+                    printError("unrecognized --showtime mode: '" + showtimeMode + "'");
                     return false;
                 }
             }
@@ -1287,7 +1297,20 @@ void CmdLineParser::printHelp()
     "    --rule-file=<file>   Use given rule file. For more information, see:\n"
     "                         http://sourceforge.net/projects/cppcheck/files/Articles/\n"
 #endif
-    // TODO: document --showtime
+    "    --showtime=<mode>    Show timing information.\n"
+    "                         The available modes are:\n"
+    "                          * none\n"
+    "                                 Show nothing (default)\n"
+    "                          * file\n"
+    "                                 Show for each processed file\n"
+    "                          * summary\n"
+    "                                 Show a summary at the end\n"
+    "                          * top5_file\n"
+    "                                 Show the top 5 for each processed file\n"
+    "                          * top5_summary\n"
+    "                                 Show the top 5 summary at the end\n"
+    "                          * top5\n"
+    "                                 Alias for top5_file (deprecated)\n"
     "    --std=<id>           Set standard.\n"
     "                         The available options are:\n"
     "                          * c89\n"
diff --git a/cli/threadexecutor.cpp b/cli/threadexecutor.cpp
@@ -194,8 +194,8 @@ unsigned int ThreadExecutor::check()
         return v + f.get();
     });
 
-    if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY)
-        CppCheck::printTimerResultsSummary();
+    if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY)
+        CppCheck::printTimerResults(mSettings.showtime);
 
     return result;
 }
diff --git a/lib/cppcheck.cpp b/lib/cppcheck.cpp
@@ -406,8 +406,8 @@ CppCheck::~CppCheck()
         mFileInfo.pop_back();
     }
 
-    if (mSettings.showtime != SHOWTIME_MODES::SHOWTIME_SUMMARY)
-        s_timerResults.showResults(mSettings.showtime);
+    if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_FILE || mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE)
+        printTimerResults(mSettings.showtime);
 
     if (mPlistFile.is_open()) {
         mPlistFile << ErrorLogger::plistFooter();
@@ -1859,7 +1859,7 @@ void CppCheck::resetTimerResults()
     s_timerResults.reset();
 }
 
-void CppCheck::printTimerResultsSummary()
+void CppCheck::printTimerResults(SHOWTIME_MODES mode)
 {
-    s_timerResults.showResults(SHOWTIME_MODES::SHOWTIME_SUMMARY);
+    s_timerResults.showResults(mode);
 }
diff --git a/lib/cppcheck.h b/lib/cppcheck.h
@@ -148,7 +148,7 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     void removeCtuInfoFiles(const std::map<std::string, std::size_t>& files);
 
     static void resetTimerResults();
-    static void printTimerResultsSummary();
+    static void printTimerResults(SHOWTIME_MODES mode);
 
 private:
     /** Are there "simple" rules */
diff --git a/lib/timer.cpp b/lib/timer.cpp
@@ -55,7 +55,7 @@ void TimerResults::showResults(SHOWTIME_MODES mode) const
         const double sec = iter->second.seconds();
         const double secAverage = sec / (double)(iter->second.mNumberOfResults);
         overallData.mClocks += iter->second.mClocks;
-        if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5) || (ordinal<=5)) {
+        if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5_FILE && mode != SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY) || (ordinal<=5)) {
             std::cout << iter->first << ": " << sec << "s (avg. " << secAverage << "s - " << iter->second.mNumberOfResults  << " result(s))" << std::endl;
         }
         ++ordinal;
diff --git a/lib/timer.h b/lib/timer.h
@@ -31,7 +31,8 @@ enum class SHOWTIME_MODES {
     SHOWTIME_NONE = 0,
     SHOWTIME_FILE,
     SHOWTIME_SUMMARY,
-    SHOWTIME_TOP5
+    SHOWTIME_TOP5_SUMMARY,
+    SHOWTIME_TOP5_FILE
 };
 
 class CPPCHECKLIB TimerResultsIntf {
diff --git a/man/cppcheck.1.xml b/man/cppcheck.1.xml
@@ -189,6 +189,9 @@ man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
       <arg choice="opt">
         <option>--rule-file=&lt;file&gt;</option>
       </arg>
+      <arg choice="opt">
+        <option>--showtime=&lt;mode&gt;</option>
+      </arg>
       <arg choice="opt">
         <option>--std=&lt;id&gt;</option>
       </arg>
@@ -543,6 +546,16 @@ There are false positives with this option. Each result must be carefully invest
           <para>Use given rule XML file. See https://sourceforge.net/projects/cppcheck/files/Articles/ for more info about the syntax. This command is only available if cppcheck was compiled with HAVE_RULES=yes.</para>
         </listitem>
       </varlistentry>
+      <varlistentry>
+        <term>
+          <option>--showtime=&lt;mode&gt;</option>
+        </term>
+        <listitem>
+          <para>Show timing information. The available mode are:
+            <glosslist><glossentry><glossterm>none</glossterm><glossdef><para>Show nothing (default)</para></glossdef></glossentry><glossentry><glossterm>file</glossterm><glossdef><para>Show for each processed file</para></glossdef></glossentry><glossentry><glossterm>summary</glossterm><glossdef><para>Show a summary at the end</para></glossdef></glossentry><glossentry><glossterm>top5_file</glossterm><glossdef><para>Show the top 5 for each processed file</para></glossdef></glossentry><glossentry><glossterm>top5_summary</glossterm><glossdef><para>Show the top 5 summary at the end</para></glossdef></glossentry><glossentry><glossterm>top5</glossterm><glossdef><para>Alias for top5_file (deprecated)</para></glossdef></glossentry></glosslist>
+          </para>
+        </listitem>
+      </varlistentry>
       <varlistentry>
         <term>
           <option>--std=&lt;id&gt;</option>
diff --git a/releasenotes.txt b/releasenotes.txt
@@ -5,4 +5,6 @@ release notes for cppcheck-2.11
 - "missingInclude" and "missingIncludeSystem" are reported with "-j" is > 1 and processes are used in the backend (default in non-Windows binaries)
 - "missingInclude" and "missingIncludeSystem" will now cause the "--error-exitcode" to be applied
 - "--enable=information" will no longer implicitly enable "missingInclude" starting with 2.16. Please enable it explicitly if you require it.
-- "--showtime=summary" will now show a single summary at the end instead of showing it after each file when using the thread execution (default on Windows)
+- "--showtime=summary" will now show a single summary at the end instead of showing it after each file when using the thread execution (default on Windows)
+- "--showtime=top5" has been deprecated and will be removed in Cppcheck 2.13. Please use --showtime=top5_file or --showtime=top5_summary instead.
+- added "--showtime=none" to disable any previously specified showtime report. "--showtime=" without parameter is no longer valid.
diff --git a/test/testcmdlineparser.cpp b/test/testcmdlineparser.cpp
@@ -169,7 +169,13 @@ class TestCmdlineParser : public TestFixture {
         TEST_CASE(xmlverunknown);
         TEST_CASE(xmlverinvalid);
         TEST_CASE(doc);
-        TEST_CASE(showtime);
+        TEST_CASE(showtimeFile);
+        TEST_CASE(showtimeTop5);
+        TEST_CASE(showtimeTop5File);
+        TEST_CASE(showtimeTop5Summary);
+        TEST_CASE(showtimeNone);
+        TEST_CASE(showtimeEmpty);
+        TEST_CASE(showtimeInvalid);
         TEST_CASE(errorlist1);
         TEST_CASE(errorlistverbose1);
         TEST_CASE(errorlistverbose2);
@@ -1354,7 +1360,7 @@ class TestCmdlineParser : public TestFixture {
         ASSERT(GET_REDIRECT_OUTPUT.find("## ") == 0);
     }
 
-    void showtime() {
+    void showtimeSummary() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--showtime=summary"};
         settings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
@@ -1363,6 +1369,65 @@ class TestCmdlineParser : public TestFixture {
         ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
     }
 
+    void showtimeFile() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=file"};
+        settings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+        ASSERT(defParser.parseFromArgs(2, argv));
+        ASSERT(settings.showtime == SHOWTIME_MODES::SHOWTIME_FILE);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
+    void showtimeTop5() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=top5"};
+        settings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+        ASSERT(defParser.parseFromArgs(2, argv));
+        ASSERT(settings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE);
+        ASSERT_EQUALS("cppcheck: --showtime=top5 is deprecated and will be removed in Cppcheck 2.13. Please use --showtime=top5_file or --showtime=top5_summary instead.\n", GET_REDIRECT_OUTPUT);
+    }
+
+    void showtimeTop5File() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=top5_file"};
+        settings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+        ASSERT(defParser.parseFromArgs(2, argv));
+        ASSERT(settings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
+    void showtimeTop5Summary() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=top5_summary"};
+        settings.showtime = SHOWTIME_MODES::SHOWTIME_NONE;
+        ASSERT(defParser.parseFromArgs(2, argv));
+        ASSERT(settings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
+    void showtimeNone() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=none"};
+        settings.showtime = SHOWTIME_MODES::SHOWTIME_FILE;
+        ASSERT(defParser.parseFromArgs(2, argv));
+        ASSERT(settings.showtime == SHOWTIME_MODES::SHOWTIME_NONE);
+        ASSERT_EQUALS("", GET_REDIRECT_OUTPUT);
+    }
+
+    void showtimeEmpty() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime="};
+        ASSERT(!defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS("cppcheck: error: no mode provided for --showtime\n", GET_REDIRECT_OUTPUT);
+    }
+
+    void showtimeInvalid() {
+        REDIRECT;
+        const char * const argv[] = {"cppcheck", "--showtime=top10"};
+        ASSERT(!defParser.parseFromArgs(2, argv));
+        ASSERT_EQUALS("cppcheck: error: unrecognized --showtime mode: 'top10'\n", GET_REDIRECT_OUTPUT);
+    }
+
     void errorlist1() {
         REDIRECT;
         const char * const argv[] = {"cppcheck", "--errorlist"};
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
@@ -82,10 +82,12 @@ class TestProcessExecutor : public TestFixture {
         TEST_CASE(no_errors_equal_amount_files);
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
-        TEST_CASE(showtime_top5);
+        TEST_CASE(showtime_top5_file);
+        TEST_CASE(showtime_top5_summary);
         TEST_CASE(showtime_file);
         TEST_CASE(showtime_summary);
-        TEST_CASE(showtime_top5_j);
+        TEST_CASE(showtime_top5_file_j);
+        TEST_CASE(showtime_top5_summary_j);
         TEST_CASE(showtime_file_j);
         TEST_CASE(showtime_summary_j);
 #endif // !WIN32
@@ -180,17 +182,29 @@ class TestProcessExecutor : public TestFixture {
 
     // TODO: provide data which actually shows values above 0
 
-    // TODO: should this be logged only once like summary?
-    void showtime_top5() {
+    void showtime_top5_file() {
         REDIRECT;
         check(1, 2, 0,
               "int main() {}",
-              true, SHOWTIME_MODES::SHOWTIME_TOP5);
-        // for each file: top5 results + overall + empty line
+              true, SHOWTIME_MODES::SHOWTIME_TOP5_FILE);
         const std::string output_s = GET_REDIRECT_OUTPUT;
+        // for each file: top5 results + overall + empty line
         TODO_ASSERT_EQUALS((5 + 1 + 1) * 2, 0, cppcheck::find_all_of(output_s, '\n'));
     }
 
+    void showtime_top5_summary() {
+        REDIRECT;
+        check(1, 2, 0,
+              "int main() {}",
+              true, 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, 0, cppcheck::find_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);
+    }
+
     void showtime_file() {
         REDIRECT;
         check(1, 2, 0,
@@ -211,16 +225,29 @@ class TestProcessExecutor : public TestFixture {
         TODO_ASSERT(output_s.find("2 result(s)") != std::string::npos);
     }
 
-    void showtime_top5_j() {
+    void showtime_top5_file_j() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
               "int main() {}",
-              true, SHOWTIME_MODES::SHOWTIME_TOP5);
-        // for each file: top5 results + overall + empty line
+              true, SHOWTIME_MODES::SHOWTIME_TOP5_FILE);
         const std::string output_s = GET_REDIRECT_OUTPUT;
+        // for each file: top5 results + overall + empty line
         TODO_ASSERT_EQUALS((5 + 1 + 1) * 2, 0, cppcheck::find_all_of(output_s, '\n'));
     }
 
+    void showtime_top5_summary_j() {
+        REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
+        check(2, 2, 0,
+              "int main() {}",
+              true, 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, 0, cppcheck::find_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);
+    }
+
     void showtime_file_j() {
         REDIRECT; // should not cause TSAN failures as the showtime logging is synchronized
         check(2, 2, 0,
diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
diff --git a/tools/donate_cpu_lib.py b/tools/donate_cpu_lib.py
diff --git a/tools/test_showtimetop5.sh b/tools/test_showtimetop5.sh

Original file line number	Diff line number	Diff line change
`@@ -194,8 +194,8 @@ unsigned int ThreadExecutor::check()`
`194`	`194`	`return v + f.get();`
`195`	`195`	`});`
`196`	`196`
`197`		`- if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY)`
`198`		`- CppCheck::printTimerResultsSummary();`
	`197`	`+ if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY \|\| mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY)`
	`198`	`+ CppCheck::printTimerResults(mSettings.showtime);`
`199`	`199`
`200`	`200`	`return result;`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -406,8 +406,8 @@ CppCheck::~CppCheck()`
`406`	`406`	`mFileInfo.pop_back();`
`407`	`407`	`}`
`408`	`408`
`409`		`- if (mSettings.showtime != SHOWTIME_MODES::SHOWTIME_SUMMARY)`
`410`		`- s_timerResults.showResults(mSettings.showtime);`
	`409`	`+ if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_FILE \|\| mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE)`
	`410`	`+ printTimerResults(mSettings.showtime);`
`411`	`411`
`412`	`412`	`if (mPlistFile.is_open()) {`
`413`	`413`	`mPlistFile << ErrorLogger::plistFooter();`
`@@ -1859,7 +1859,7 @@ void CppCheck::resetTimerResults()`
`1859`	`1859`	`s_timerResults.reset();`
`1860`	`1860`	`}`
`1861`	`1861`
`1862`		`-void CppCheck::printTimerResultsSummary()`
	`1862`	`+void CppCheck::printTimerResults(SHOWTIME_MODES mode)`
`1863`	`1863`	`{`
`1864`		`- s_timerResults.showResults(SHOWTIME_MODES::SHOWTIME_SUMMARY);`
	`1864`	`+ s_timerResults.showResults(mode);`
`1865`	`1865`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ void TimerResults::showResults(SHOWTIME_MODES mode) const`
`55`	`55`	`const double sec = iter->second.seconds();`
`56`	`56`	`const double secAverage = sec / (double)(iter->second.mNumberOfResults);`
`57`	`57`	`overallData.mClocks += iter->second.mClocks;`
`58`		`- if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5) \|\| (ordinal<=5)) {`
	`58`	`+ if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5_FILE && mode != SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY) \|\| (ordinal<=5)) {`
`59`	`59`	`std::cout << iter->first << ": " << sec << "s (avg. " << secAverage << "s - " << iter->second.mNumberOfResults << " result(s))" << std::endl;`
`60`	`60`	`}`
`61`	`61`	`++ordinal;`