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

firewave · firewave · commit e6ea41d4edab · 2023-08-04T14:22:39.000+02:00
diff --git a/.github/workflows/CI-unixish.yml b/.github/workflows/CI-unixish.yml
@@ -460,7 +460,7 @@ jobs:
 
       - name: Self check
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --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 --check-level=exhaustive"
+          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5_summary -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --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 --check-level=exhaustive"
           ec=0
           
           # early exit
diff --git a/.github/workflows/asan.yml b/.github/workflows/asan.yml
@@ -82,7 +82,7 @@ jobs:
       - name: Self check
         if: false
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --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__ -DCHECK_INTERNAL -DHAVE_RULES --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 cli lib || ec=1
           ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --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
@@ -82,7 +82,7 @@ jobs:
       - name: Self check
         if: false
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --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__ -DCHECK_INTERNAL -DHAVE_RULES --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 -DQT_CHARTS_LIB --library=qt --addon=naming.json -Icmake.output/gui -Igui gui/*.cpp cmake.output/gui/*.cpp || ec=1
diff --git a/.github/workflows/ubsan.yml b/.github/workflows/ubsan.yml
@@ -78,7 +78,7 @@ jobs:
       # TODO: only fail the step on sanitizer issues - since we use processes it will only fail the underlying process which will result in an cppcheckError
       - name: Self check
         run: |
-          selfcheck_options="-q -j$(nproc) --std=c++11 --template=selfcheck --showtime=top5 -D__CPPCHECK__ -DCHECK_INTERNAL -DHAVE_RULES --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__ -DCHECK_INTERNAL -DHAVE_RULES --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 cli lib || ec=1
           ./cmake.output/bin/cppcheck $selfcheck_options -DQT_VERSION=0x050000 -DQ_MOC_OUTPUT_REVISION=67 -DQT_CHARTS_LIB --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
@@ -821,12 +821,22 @@ bool CmdLineParser::parseFromArgs(int argc, const char* const argv[])
                     mSettings.showtime = SHOWTIME_MODES::SHOWTIME_FILE_TOTAL;
                 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, file-total, summary, top5.");
+                    printError("unrecognized --showtime mode: \"" + showtimeMode + "\". Supported modes: file, file-total, summary, top5.");
                     return false;
                 }
             }
@@ -1296,7 +1306,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
@@ -198,8 +198,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
@@ -405,8 +405,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();
@@ -1841,7 +1841,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
@@ -142,7 +142,7 @@ class CPPCHECKLIB CppCheck : ErrorLogger {
     void removeCtuInfoFiles(const std::map<std::string, std::size_t>& files); // cppcheck-suppress functionConst // has side effects
 
     static void resetTimerResults();
-    static void printTimerResultsSummary();
+    static void printTimerResults(SHOWTIME_MODES mode);
 
 private:
 #ifdef HAVE_RULES
diff --git a/lib/timer.cpp b/lib/timer.cpp
@@ -69,7 +69,7 @@ void TimerResults::showResults(SHOWTIME_MODES mode) const
         }
         if (!hasParent)
             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
@@ -32,7 +32,8 @@ enum class SHOWTIME_MODES {
     SHOWTIME_FILE,
     SHOWTIME_FILE_TOTAL,
     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
@@ -10,3 +10,5 @@ Changed interface:
 
 Other:
 - "--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
@@ -181,7 +181,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);
@@ -1522,7 +1528,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;
@@ -1531,6 +1537,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
@@ -105,10 +105,12 @@ class TestProcessExecutor : public TestFixture {
         TEST_CASE(one_error_less_files);
         TEST_CASE(one_error_several_files);
         TEST_CASE(markup);
-        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
@@ -244,17 +246,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,
@@ -275,16 +289,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

Original file line number	Diff line number	Diff line change
`@@ -198,8 +198,8 @@ unsigned int ThreadExecutor::check()`
`198`	`198`	`return v + f.get();`
`199`	`199`	`});`
`200`	`200`
`201`		`- if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY)`
`202`		`- CppCheck::printTimerResultsSummary();`
	`201`	`+ if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_SUMMARY \|\| mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY)`
	`202`	`+ CppCheck::printTimerResults(mSettings.showtime);`
`203`	`203`
`204`	`204`	`return result;`
`205`	`205`	`}`
Original file line number	Diff line number	Diff line change
`@@ -405,8 +405,8 @@ CppCheck::~CppCheck()`
`405`	`405`	`mFileInfo.pop_back();`
`406`	`406`	`}`
`407`	`407`
`408`		`- if (mSettings.showtime != SHOWTIME_MODES::SHOWTIME_SUMMARY)`
`409`		`- s_timerResults.showResults(mSettings.showtime);`
	`408`	`+ if (mSettings.showtime == SHOWTIME_MODES::SHOWTIME_FILE \|\| mSettings.showtime == SHOWTIME_MODES::SHOWTIME_TOP5_FILE)`
	`409`	`+ printTimerResults(mSettings.showtime);`
`410`	`410`
`411`	`411`	`if (mPlistFile.is_open()) {`
`412`	`412`	`mPlistFile << ErrorLogger::plistFooter();`
`@@ -1841,7 +1841,7 @@ void CppCheck::resetTimerResults()`
`1841`	`1841`	`s_timerResults.reset();`
`1842`	`1842`	`}`
`1843`	`1843`
`1844`		`-void CppCheck::printTimerResultsSummary()`
	`1844`	`+void CppCheck::printTimerResults(SHOWTIME_MODES mode)`
`1845`	`1845`	`{`
`1846`		`- s_timerResults.showResults(SHOWTIME_MODES::SHOWTIME_SUMMARY);`
	`1846`	`+ s_timerResults.showResults(mode);`
`1847`	`1847`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ void TimerResults::showResults(SHOWTIME_MODES mode) const`
`69`	`69`	`}`
`70`	`70`	`if (!hasParent)`
`71`	`71`	`overallData.mClocks += iter->second.mClocks;`
`72`		`- if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5) \|\| (ordinal<=5)) {`
	`72`	`+ if ((mode != SHOWTIME_MODES::SHOWTIME_TOP5_FILE && mode != SHOWTIME_MODES::SHOWTIME_TOP5_SUMMARY) \|\| (ordinal<=5)) {`
`73`	`73`	`std::cout << iter->first << ": " << sec << "s (avg. " << secAverage << "s - " << iter->second.mNumberOfResults << " result(s))" << std::endl;`
`74`	`74`	`}`
`75`	`75`	`++ordinal;`