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

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

parent 1fa882db
Loading
Loading
Loading
Loading
+1 −12
Original line number Diff line number Diff line
@@ -30,10 +30,7 @@
#ifndef __PROFILE_H
#define __PROFILE_H

#ifdef __linux__
#include <sys/time.h>
#endif

#include <stdint.h>

/**
@@ -95,15 +92,10 @@ static __inline__ unsigned long long rdtsc()
 */
static inline uint64_t get_tics()
{
#if defined(__linux__)
    struct timeval tv;
    gettimeofday( &tv, NULL );

    return (uint64_t) tv.tv_sec * 1000000ULL + (uint64_t) tv.tv_usec;
#elif defined _WIN32 || defined _WIN64
    return GetTickCount() * 1000;
#else
    return 0;
#endif
}

@@ -152,6 +144,3 @@ static inline void prof_end( prof_counter* cnt )
    else
        cnt->value = get_tics() - cnt->value;
}


#endif