Commit 2ee99f74 authored by Maciej Suminski's avatar Maciej Suminski

Fixed profiling timers for compilation under Win32 (and hopefully Mac OS too).

parent 1fa882db
...@@ -30,10 +30,7 @@ ...@@ -30,10 +30,7 @@
#ifndef __PROFILE_H #ifndef __PROFILE_H
#define __PROFILE_H #define __PROFILE_H
#ifdef __linux__ #include <sys/time.h>
#include <sys/time.h>
#endif
#include <stdint.h> #include <stdint.h>
/** /**
...@@ -95,15 +92,10 @@ static __inline__ unsigned long long rdtsc() ...@@ -95,15 +92,10 @@ static __inline__ unsigned long long rdtsc()
*/ */
static inline uint64_t get_tics() static inline uint64_t get_tics()
{ {
#if defined(__linux__)
struct timeval tv; struct timeval tv;
gettimeofday( &tv, NULL ); gettimeofday( &tv, NULL );
return (uint64_t) tv.tv_sec * 1000000ULL + (uint64_t) tv.tv_usec; return (uint64_t) tv.tv_sec * 1000000ULL + (uint64_t) tv.tv_usec;
#elif defined _WIN32 || defined _WIN64
return GetTickCount() * 1000;
#else
return 0;
#endif #endif
} }
...@@ -152,6 +144,3 @@ static inline void prof_end( prof_counter* cnt ) ...@@ -152,6 +144,3 @@ static inline void prof_end( prof_counter* cnt )
else else
cnt->value = get_tics() - cnt->value; cnt->value = get_tics() - cnt->value;
} }
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment