Merge remote-tracking branch 'upstream/dev-modernize' into dev-better-verbosity

1 files changed, 34 insertions, 0 deletions

diff --git a/include/internal/catch_timer.cpp b/include/internal/catch_timer.cpp
new file mode 100644
index 00000000..d4066fa9
--- /dev/null
+++ b/include/internal/catch_timer.cpp
@@ -0,0 +1,34 @@
+/*
+ *  Created by Phil on 05/08/2013.
+ *  Copyright 2013 Two Blue Cubes Ltd. All rights reserved.
+ *
+ *  Distributed under the Boost Software License, Version 1.0. (See accompanying
+ *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+ */
+
+#include "catch_timer.h"
+
+#include <chrono>
+
+namespace Catch {
+
+    namespace {
+        uint64_t getCurrentMicrosecondsSinceEpoch() {
+            return std::chrono::duration_cast<std::chrono::microseconds>( std::chrono::high_resolution_clock::now().time_since_epoch() ).count();
+        }
+    }
+
+    void Timer::start() {
+        m_microSeconds = getCurrentMicrosecondsSinceEpoch();
+    }
+    unsigned int Timer::getElapsedMicroseconds() const {
+        return static_cast<unsigned int>(getCurrentMicrosecondsSinceEpoch() - m_microSeconds);
+    }
+    unsigned int Timer::getElapsedMilliseconds() const {
+        return static_cast<unsigned int>(getElapsedMicroseconds()/1000);
+    }
+    double Timer::getElapsedSeconds() const {
+        return getElapsedMicroseconds()/1000000.0;
+    }
+
+} // namespace Catch