Merge branch 'stats'

Conflicts:
	grextras
	include/gras/top_block.hpp
	lib/block_handlers.cpp
	lib/block_task.cpp
	lib/element_impl.hpp
	tests/CMakeLists.txt

1 files changed, 74 insertions, 0 deletions

diff --git a/include/gras/chrono.hpp b/include/gras/chrono.hpp
new file mode 100644
index 0000000..c976675
--- /dev/null
+++ b/include/gras/chrono.hpp
@@ -0,0 +1,74 @@
+// Copyright (C) by Josh Blum. See LICENSE.txt for licensing information.
+
+//Boost chrono has awesome high res timer!
+//But its only in very recent boosts,
+//so we have this little wrapper...
+//now/tps inspired by libnumanuma.
+
+#ifndef INCLUDED_GRAS_CHRONO_HPP
+#define INCLUDED_GRAS_CHRONO_HPP
+
+#include <gras/gras.hpp>
+
+namespace gras
+{
+    typedef long long time_ticks_t;
+
+    //! Get the time now in tick counts
+    time_ticks_t time_now(void);
+
+    //! Get the number of ticks per second
+    time_ticks_t time_tps(void);
+}
+
+//--------------------------------------------------------------------//
+//------------------ implementation details below --------------------//
+//--------------------------------------------------------------------//
+
+#if defined(_WIN32) || defined(__WIN32__) || defined(WIN32)
+
+#include <windows.h>
+
+namespace gras
+{
+
+    GRAS_FORCE_INLINE time_ticks_t time_now(void)
+    {
+        LARGE_INTEGER counts;
+        QueryPerformanceCounter(&counts);
+        return counts.QuadPart;
+    }
+
+    GRAS_FORCE_INLINE time_ticks_t time_tps(void)
+    {
+        LARGE_INTEGER freq;
+        QueryPerformanceFrequency(&freq);
+        return freq.QuadPart;
+    }
+
+} //namespace gras
+
+#else
+
+#include <ctime>
+
+namespace gras
+{
+
+    GRAS_FORCE_INLINE time_ticks_t time_now(void)
+    {
+        struct timespec ts;
+        clock_gettime(CLOCK_MONOTONIC, &ts);
+        return ts.tv_sec*1000000000UL + ts.tv_nsec;
+    }
+
+    GRAS_FORCE_INLINE time_ticks_t time_tps(void)
+    {
+        return 1000000000UL;
+    }
+
+} //namespace gras
+
+#endif
+
+#endif /*INCLUDED_GRAS_CHRONO_HPP*/