Add propper client initialization

[dragonfireclient.git] / src / porting.h

diff --git a/src/porting.h b/src/porting.h
index 74ee97f88efa8dcca558d2d4229e3ad018937578..7cd4cf031f446bf9c433e14aa5eca9b210ffc468 100644 (file)
--- a/src/porting.h
+++ b/src/porting.h
@@ -28,6 +28,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes.h" // u32
 #include "debug.h"
 #include "constants.h"
+#include "gettime.h"
+#include "threads.h"
 
 #ifdef _MSC_VER
        #define SWPRINTF_CHARSTRING L"%S"
@@ -40,14 +42,17 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 //#define ALIGNOF(type) offsetof (alignment_trick<type>, member)
 
 #ifdef _WIN32
+       #ifndef _WIN32_WINNT
+               #define _WIN32_WINNT 0x0501
+       #endif
        #include <windows.h>
        
        #define sleep_ms(x) Sleep(x)
 #else
        #include <unistd.h>
        #include <stdint.h> //for uintptr_t
-
-       #if defined(linux) || defined(__linux)
+       
+       #if (defined(linux) || defined(__linux)) && !defined(_GNU_SOURCE)
                #define _GNU_SOURCE
        #endif
 
@@ -72,7 +77,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
        #define THREAD_PRIORITY_BELOW_NORMAL 1
        #define THREAD_PRIORITY_NORMAL       2
        #define THREAD_PRIORITY_ABOVE_NORMAL 3
-       #define THREAD_PRIORITY_HIGHEST      4
+       #define THREAD_PRIORITY_HIGHEST      4
 #endif
 
 #ifdef _MSC_VER
@@ -143,25 +148,81 @@ bool threadBindToProcessor(threadid_t tid, int pnumber);
 */
 bool threadSetPriority(threadid_t tid, int prio);
 
+/*
+       Return system information
+       e.g. "Linux/3.12.7 x86_64"
+*/
+std::string get_sysinfo();
+
 /*
        Resolution is 10-20ms.
        Remember to check for overflows.
        Overflow can occur at any value higher than 10000000.
 */
 #ifdef _WIN32 // Windows
+#ifndef _WIN32_WINNT
+       #define _WIN32_WINNT 0x0501
+#endif
        #include <windows.h>
+       
+       inline u32 getTimeS()
+       {
+               return GetTickCount() / 1000;
+       }
+       
        inline u32 getTimeMs()
        {
                return GetTickCount();
        }
+       
+       inline u32 getTimeUs()
+       {
+               LARGE_INTEGER freq, t;
+               QueryPerformanceFrequency(&freq);
+               QueryPerformanceCounter(&t);
+               return (double)(t.QuadPart) / ((double)(freq.QuadPart) / 1000000.0);
+       }
+       
+       inline u32 getTimeNs()
+       {
+               LARGE_INTEGER freq, t;
+               QueryPerformanceFrequency(&freq);
+               QueryPerformanceCounter(&t);
+               return (double)(t.QuadPart) / ((double)(freq.QuadPart) / 1000000000.0);
+       }
+       
 #else // Posix
        #include <sys/time.h>
+       #include <time.h>
+       
+       inline u32 getTimeS()
+       {
+               struct timeval tv;
+               gettimeofday(&tv, NULL);
+               return tv.tv_sec;
+       }
+       
        inline u32 getTimeMs()
        {
                struct timeval tv;
                gettimeofday(&tv, NULL);
                return tv.tv_sec * 1000 + tv.tv_usec / 1000;
        }
+       
+       inline u32 getTimeUs()
+       {
+               struct timeval tv;
+               gettimeofday(&tv, NULL);
+               return tv.tv_sec * 1000000 + tv.tv_usec;
+       }
+       
+       inline u32 getTimeNs()
+       {
+               struct timespec ts;
+               clock_gettime(CLOCK_REALTIME, &ts);
+               return ts.tv_sec * 1000000000 + ts.tv_nsec;
+       }
+       
        /*#include <sys/timeb.h>
        inline u32 getTimeMs()
        {
@@ -171,6 +232,22 @@ bool threadSetPriority(threadid_t tid, int prio);
        }*/
 #endif
 
+inline u32 getTime(TimePrecision prec)
+{
+       switch (prec) {
+               case PRECISION_SECONDS:
+                       return getTimeS();
+               case PRECISION_MILLI:
+                       return getTimeMs();
+               case PRECISION_MICRO:
+                       return getTimeUs();
+               case PRECISION_NANO:
+                       return getTimeNs();
+       }
+       return 0;
+}
+
+
 } // namespace porting
 
 #endif // PORTING_HEADER