timer [skip ci]

Author: firewave

Makefile

@@ -722,7 +722,7 @@ cli/stacktrace.o: cli/stacktrace.cpp cli/stacktrace.h lib/config.h lib/utils.h
 cli/threadexecutor.o: cli/threadexecutor.cpp cli/executor.h cli/threadexecutor.h lib/addoninfo.h lib/check.h lib/checkers.h lib/config.h lib/cppcheck.h lib/errorlogger.h lib/errortypes.h lib/filesettings.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/threadexecutor.cpp
 
-test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h test/options.h test/redirect.h
+test/fixture.o: test/fixture.cpp externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/timer.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/fixture.h test/helpers.h test/options.h test/redirect.h
 	$(CXX) ${INCLUDE_FOR_TEST} ${CFLAGS_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/fixture.cpp
 
 test/helpers.o: test/helpers.cpp cli/filelister.h externals/simplecpp/simplecpp.h externals/tinyxml2/tinyxml2.h lib/addoninfo.h lib/checkers.h lib/config.h lib/errortypes.h lib/filesettings.h lib/library.h lib/mathlib.h lib/path.h lib/pathmatch.h lib/platform.h lib/preprocessor.h lib/settings.h lib/standards.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/xml.h test/helpers.h

lib/timer.cpp

@@ -94,28 +94,36 @@ Timer::~Timer()
     stop();
 }
 
-void Timer::stop()
+void Timer::restart()
+{
+    mStart = Clock::now();
+}
+
+double Timer::stop()
 {
     if (mMode == ShowTime::NONE)
-        return;
+        return -1.0;
     if (mType == Type::OVERALL && mMode != ShowTime::TOP5_SUMMARY && mMode != ShowTime::SUMMARY) {
         mMode = ShowTime::NONE;
-        return;
+        return -1.0;
     }
     if (mType == Type::FILE && mMode != ShowTime::TOP5_FILE && mMode != ShowTime::FILE && mMode != ShowTime::FILE_TOTAL) {
         mMode = ShowTime::NONE;
-        return;
+        return -1.0;
     }
     if (mStart != TimePoint{}) {
         auto diff = std::chrono::duration_cast<std::chrono::milliseconds>(Clock::now() - mStart);
         if (!mResults) {
+            // TODO: do not print implicitly
             std::lock_guard<std::mutex> l(stdCoutLock);
             std::cout << (mType == Type::OVERALL ? "Overall time: " : "Check time: " + mName + ": ") << TimerResultsData::durationToString(diff) << std::endl;
         } else {
             mResults->addResults(mName, diff);
         }
+        return diff.count();
     }
     mMode = ShowTime::NONE; // prevent multiple stops
+    return -1.0;
 }
 
 std::string TimerResultsData::durationToString(std::chrono::milliseconds duration)

lib/timer.h

@@ -87,7 +87,8 @@ class CPPCHECKLIB Timer {
     Timer(const Timer&) = delete;
     Timer& operator=(const Timer&) = delete;
 
-    void stop();
+    void restart();
+    double stop();
 
     template<class TFunc>
     static void run(std::string str, ShowTime showtimeMode, TimerResultsIntf* timerResults, const TFunc& f) {

test/fixture.cpp

@@ -23,6 +23,7 @@
 #include "library.h"
 #include "options.h"
 #include "redirect.h"
+#include "timer.h"
 
 #include <algorithm>
 #include <cstdio>
@@ -84,8 +85,11 @@ std::size_t TestFixture::fails_counter = 0;
 std::size_t TestFixture::todos_counter = 0;
 std::size_t TestFixture::succeeded_todos_counter = 0;
 
+static TimerResults timerResults;
+
 TestFixture::TestFixture(const char * const _name)
-    : classname(_name)
+    : mTimer(new Timer("", ShowTime::SUMMARY, &timerResults))
+    , classname(_name)
 {}
 
 
@@ -105,7 +109,8 @@ bool TestFixture::prepareTest(const char testname[])
             std::putchar('.'); // Use putchar to write through redirection of std::cout/cerr
             std::fflush(stdout);
         } else {
-            std::cout << classname << "::" << mTestname << std::endl;
+            std::cout << classname << "::" << mTestname /*<< std::endl*/;
+            mTimer->restart();
         }
         return !dry_run;
     }
@@ -114,6 +119,9 @@ bool TestFixture::prepareTest(const char testname[])
 
 void TestFixture::teardownTest()
 {
+    if (mTimer)
+        std::cout << " - " << mTimer->stop() << "ms" << std::endl;
+
     teardownTestInternal();
 
     {

test/fixture.h

@@ -42,6 +42,7 @@
 
 class options;
 class Tokenizer;
+class Timer;
 
 class TestFixture : public ErrorLogger {
 private:
@@ -284,6 +285,8 @@ class TestFixture : public ErrorLogger {
     std::ostringstream mOutput;
     std::ostringstream mErrout;
 
+    std::unique_ptr<Timer> mTimer;
+
     void reportOut(const std::string &outmsg, Color c = Color::Reset) override;
     void reportErr(const ErrorMessage &msg) override;
     void reportMetric(const std::string &metric) override

test/options.cpp

@@ -23,6 +23,7 @@ options::options(int argc, const char* const argv[])
     ,mSummary(mWhichTests.count("-n") == 0)
     ,mDryRun(mWhichTests.count("-d") != 0)
     ,mExcludeTests(mWhichTests.count("-x") != 0)
+    ,mShowTime(mWhichTests.count("-t") != 0)
     ,mExe(argv[0])
 {
     for (auto it = mWhichTests.cbegin(); it != mWhichTests.cend();) {
@@ -71,3 +72,8 @@ bool options::exclude_tests() const
 {
     return mExcludeTests;
 }
+
+bool options::show_time() const
+{
+    return mShowTime;
+}

test/options.h

@@ -39,6 +39,8 @@ class options {
     bool dry_run() const;
     /** Exclude provided lists of tests. */
     bool exclude_tests() const;
+    /** Print the runtime of the tests. */
+    bool show_time() const;
     /** Which test should be run. Empty string means 'all tests' */
     const std::set<std::string>& which_test() const;
 
@@ -55,6 +57,7 @@ class options {
     const bool mSummary;
     const bool mDryRun;
     const bool mExcludeTests;
+    const bool mShowTime;
     std::string mExe;
 };