new cvar sys_useclockgettime (default 0) that makes DP use clock_gettime as time...

[xonotic/darkplaces.git] / sys_linux.c

diff --git a/sys_linux.c b/sys_linux.c
index 6264af67cdf3130feef0c559d2d62ea33700c5d6..0ddf3224d68d49f499d26588bea10cceed3e5412 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -1,3 +1,4 @@
+#include "quakedef.h"
 
 #ifdef WIN32
 #include <io.h>
@@ -6,15 +7,18 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/time.h>
+#include <time.h>
 #endif
 
 #include <signal.h>
 
-#include "quakedef.h"
-
 
 #ifdef WIN32
 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows timeGetTime function (which has issues on some motherboards) for timing rather than QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power)"};
+#else
+# ifndef MACOSX
+cvar_t sys_useclockgettime = {CVAR_SAVE, "sys_useclockgettime", "0", "use POSIX clock_gettime function (which has issues if the system clock speed is far off, as it can't get fixed by NTP) for timing rather than gettimeofday (which has issues if the system time is stepped by ntpdate, or apparently on some Xen installations)"};
+# endif
 #endif
 
 
@@ -130,9 +134,24 @@ double Sys_DoubleTime (void)
                #endif
        }
 #else
-       struct timeval tp;
-       gettimeofday(&tp, NULL);
-       newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
+# ifndef MACOSX
+       if (sys_useclockgettime.integer)
+       {
+               struct timespec ts;
+#  ifdef SUNOS
+               clock_gettime(CLOCK_HIGHRES, &ts);
+#  else
+               clock_gettime(CLOCK_MONOTONIC, &ts);
+#  endif
+               newtime = (double) ts.tv_sec + ts.tv_nsec / 1000000000.0;
+       }
+       else
+# endif
+       {
+               struct timeval tp;
+               gettimeofday(&tp, NULL);
+               newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
+       }
 #endif
 
        if (first)
@@ -214,14 +233,12 @@ char *Sys_ConsoleInput(void)
        return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
+void Sys_Sleep(int microseconds)
 {
-       if (milliseconds < 1)
-               milliseconds = 1;
 #ifdef WIN32
-       Sleep(milliseconds);
+       Sleep(microseconds / 1000);
 #else
-       usleep(milliseconds * 1000);
+       usleep(microseconds);
 #endif
 }
 
@@ -236,12 +253,17 @@ void Sys_InitConsole (void)
 
 void Sys_Init_Commands (void)
 {
+#ifdef WIN32
+       Cvar_RegisterVariable(&sys_usetimegettime);
+#else
+# ifndef MACOSX
+       Cvar_RegisterVariable(&sys_useclockgettime);
+# endif
+#endif
 }
 
 int main (int argc, char **argv)
 {
-       double frameoldtime, framenewtime;
-
        signal(SIGFPE, SIG_IGN);
 
        com_argc = argc;
@@ -251,17 +273,7 @@ int main (int argc, char **argv)
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 #endif
 
-       Host_Init();
+       Host_Main();
 
-       frameoldtime = Sys_DoubleTime () - 0.1;
-       while (1)
-       {
-               // find time spent rendering last frame
-               framenewtime = Sys_DoubleTime ();
-
-               Host_Frame (framenewtime - frameoldtime);
-
-               frameoldtime = framenewtime;
-       }
        return 0;
 }