From 02c933d08437fda41c53c7575e473748009a0851 Mon Sep 17 00:00:00 2001
From: Branimir Karadzic <branimirkaradzic@gmail.com>
Date: Tue, 6 Nov 2012 22:15:03 -0800
Subject: [PATCH] Added clock_gettime code path for Linux. Disabled for now
 because it requires additional linking with rt lib.

---
 include/bx/timer.h | 130 +++++++++++++++++++++++----------------------
 1 file changed, 67 insertions(+), 63 deletions(-)

diff --git a/include/bx/timer.h b/include/bx/timer.h
index 909be8e..ae6c0bb 100644
--- a/include/bx/timer.h
+++ b/include/bx/timer.h
@@ -1,63 +1,67 @@
-/*
- * Copyright 2010-2011 Branimir Karadzic. All rights reserved.
- * License: http://www.opensource.org/licenses/BSD-2-Clause
- */
-
-#ifndef __BX_TIMER_H__
-#define __BX_TIMER_H__
-
-#include "bx.h"
-
-#if BX_PLATFORM_ANDROID
-#	include <time.h> // clock, clock_gettime
-#elif BX_PLATFORM_NACL | BX_PLATFORM_LINUX
-#	include <sys/time.h> // gettimeofday
-#elif BX_PLATFORM_OSX
-#	include <mach/mach_time.h> // mach_absolute_time/mach_timebase_info
-#elif BX_PLATFORM_WINDOWS
-#	include <windows.h>
-#endif // BX_PLATFORM_
-
-namespace bx
-{
-	inline int64_t getHPCounter()
-	{
-#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360
-		LARGE_INTEGER li;
-		// Performance counter value may unexpectedly leap forward
-		// http://support.microsoft.com/kb/274323
-		QueryPerformanceCounter(&li);
-		int64_t i64 = li.QuadPart;
-#elif BX_PLATFORM_ANDROID || BX_PLATFORM_EMSCRIPTEN
-		int64_t i64 = clock();
-#elif BX_PLATFORM_OSX
-		int64_t i64 = mach_absolute_time();
-#else
-		struct timeval now;
-		gettimeofday(&now, 0);
-		int64_t i64 = now.tv_sec*1000000 + now.tv_usec;
-#endif // BNET_PLATFORM_
-		static int64_t offset = i64;
-		return i64 - offset;
-	}
-
-	inline int64_t getHPFrequency()
-	{
-#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360
-		LARGE_INTEGER li;
-		QueryPerformanceFrequency(&li);
-		return li.QuadPart;
-#elif BX_PLATFORM_ANDROID || BX_PLATFORM_EMSCRIPTEN
-		return CLOCKS_PER_SEC;
-#elif BX_PLATFORM_OSX
-		mach_timebase_info_data_t info;
-		mach_timebase_info(&info);
-		return (int64_t)(info.denom * 1000000) / info.numer;
-#else
-		return 1000000;
-#endif // BNET_PLATFORM_
-	}
-
-} // namespace bx
-
-#endif // __BX_TIMER_H__
+/*
+ * Copyright 2010-2011 Branimir Karadzic. All rights reserved.
+ * License: http://www.opensource.org/licenses/BSD-2-Clause
+ */
+
+#ifndef __BX_TIMER_H__
+#define __BX_TIMER_H__
+
+#include "bx.h"
+
+#if BX_PLATFORM_ANDROID
+#	include <time.h> // clock, clock_gettime
+#elif BX_PLATFORM_NACL || BX_PLATFORM_LINUX
+#	include <sys/time.h> // gettimeofday
+#elif BX_PLATFORM_OSX
+#	include <mach/mach_time.h> // mach_absolute_time/mach_timebase_info
+#elif BX_PLATFORM_WINDOWS
+#	include <windows.h>
+#endif // BX_PLATFORM_
+
+namespace bx
+{
+	inline int64_t getHPCounter()
+	{
+#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360
+		LARGE_INTEGER li;
+		// Performance counter value may unexpectedly leap forward
+		// http://support.microsoft.com/kb/274323
+		QueryPerformanceCounter(&li);
+		int64_t i64 = li.QuadPart;
+#elif BX_PLATFORM_ANDROID || BX_PLATFORM_EMSCRIPTEN
+		int64_t i64 = clock();
+#elif BX_PLATFORM_OSX
+		int64_t i64 = mach_absolute_time();
+#elif 0 // BX_PLATFORM_LINUX
+		struct timespec now;
+		clock_gettime(CLOCK_MONOTONIC_RAW, &now);
+		int64_t i64 = now.tv_sec*1000000 + now.tv_nsec/1000;
+#else
+		struct timeval now;
+		gettimeofday(&now, 0);
+		int64_t i64 = now.tv_sec*1000000 + now.tv_usec;
+#endif // BNET_PLATFORM_
+		static int64_t offset = i64;
+		return i64 - offset;
+	}
+
+	inline int64_t getHPFrequency()
+	{
+#if BX_PLATFORM_WINDOWS || BX_PLATFORM_XBOX360
+		LARGE_INTEGER li;
+		QueryPerformanceFrequency(&li);
+		return li.QuadPart;
+#elif BX_PLATFORM_ANDROID || BX_PLATFORM_EMSCRIPTEN
+		return CLOCKS_PER_SEC;
+#elif BX_PLATFORM_OSX
+		mach_timebase_info_data_t info;
+		mach_timebase_info(&info);
+		return (int64_t)(info.denom * 1000000) / info.numer;
+#else
+		return 1000000;
+#endif // BNET_PLATFORM_
+	}
+
+} // namespace bx
+
+#endif // __BX_TIMER_H__