Unix time measurement for profiling

Author: Roderick Kennedy

Core/Timer.cpp

@@ -16,17 +16,20 @@ using namespace platform::core;
 #else
 	#define LARGE_INTEGER long
 #endif
-#if defined(__ORBIS__) | defined(__COMMODORE__)
-#include <perf.h>
-static uint64_t performanceCounter()
+#if defined(__ORBIS__) || defined(__COMMODORE__) || defined(UNIX)
+	#include <time.h>
+	#if defined(__ORBIS__)
+		#include <perf.h>
+	#endif
+	static uint64_t performanceCounter()
 	{
 		uint64_t result = 0;
 		timespec ts;
 		clock_gettime(CLOCK_MONOTONIC, &ts);
 		result = (uint64_t)ts.tv_sec * 1000000000LL + (uint64_t)ts.tv_nsec;
 		return result;
 	}
-	uint64_t performanceFrequency()
+	static uint64_t performanceFrequency()
 	{
 		uint64_t result = 1;
 		result = 1000000000LL;
@@ -84,8 +87,8 @@ void Timer::StartTime()
 	LARGE_INTEGER &tStart=*(reinterpret_cast<LARGE_INTEGER*>(&iStart));
 	QueryPerformanceCounter(&tStart);
 #endif
-#if defined(__ORBIS__) | defined(__COMMODORE__)
-	iStart=(double)performanceCounter();
+#if defined(__ORBIS__) || defined(__COMMODORE__) || defined(UNIX)
+	iStart=performanceCounter();
 #endif
 }
 
@@ -101,8 +104,8 @@ float Timer::FinishTime()
 		Time=((float)(tStop.QuadPart-tStart.QuadPart-Oht))/(float)dPerfFreq;
 	TimeSum+=Time;
 #endif
-#if defined(__ORBIS__) | defined(__COMMODORE__)
-	iStop=(double)performanceCounter();
+#if defined(__ORBIS__) || defined(__COMMODORE__) || defined(UNIX)
+	iStop=performanceCounter();
 	Time=(float)(1000.0*(double)(iStop-iStart)/(double)performanceFrequency());
 	iStart=iStop;
 	TimeSum+=Time;
@@ -122,7 +125,7 @@ float Timer::AbsoluteTimeMS()
 	else
 		t=((float)(tStop.QuadPart-tStart.QuadPart))/(float)dPerfFreq;
 #endif
-#ifdef __ORBIS__
+#if defined(__ORBIS__) || defined(__COMMODORE__) || defined(UNIX)
 	return (float)(1000.0*(double)performanceCounter()/(double)performanceFrequency());
 #endif
 	return t;

Core/Timer.h

@@ -20,10 +20,10 @@ namespace platform
 		{
 		private:
 			static __int64 OverheadTicks;			// overhead  in calling timer
-		#if defined(__ORBIS__) | defined(__COMMODORE__)
+		#if defined(__ORBIS__) || defined(__COMMODORE__) || defined(UNIX)
 			uint64_t iStart,iStop;
 		#endif
-		#ifdef _MSC_VER     
+		#ifdef _MSC_VER
 			Int64 iStart,iStop;
 			int PerfFreqAdjust;			// in case Freq is too big
 			float dPerfFreq;			// ticks per second