another bugfix for WORKINGLQUAKE code

[xonotic/darkplaces.git] / sys_linux.c

diff --git a/sys_linux.c b/sys_linux.c
index 90c959b995a34b6fa7747a44fdfd333924abed11..1e675e4799a5865f88cba7deb9421d6d4f0d5d4e 100644 (file)
--- a/sys_linux.c
+++ b/sys_linux.c
@@ -19,21 +19,38 @@
 #include <errno.h>
 #include <time.h>
 
+#include <dlfcn.h>
+
 #include "quakedef.h"
 
-char *basedir = ".";
-#if CACHEENABLE
-char *cachedir = "/tmp";
-#endif
+/*
+===============================================================================
 
-// =======================================================================
-// General routines
-// =======================================================================
+DLL MANAGEMENT
+
+===============================================================================
+*/
+
+dllhandle_t Sys_LoadLibrary (const char* name)
+{
+       return dlopen (name, RTLD_LAZY);
+}
 
-void Sys_DebugNumber(int y, int val)
+void Sys_UnloadLibrary (dllhandle_t handle)
 {
+       dlclose (handle);
 }
 
+void* Sys_GetProcAddress (dllhandle_t handle, const char* name)
+{
+       return (void *)dlsym (handle, name);
+}
+
+
+// =======================================================================
+// General routines
+// =======================================================================
+
 void Sys_Quit (void)
 {
        Host_Shutdown();
@@ -42,7 +59,7 @@ void Sys_Quit (void)
        exit(0);
 }
 
-void Sys_Error (char *error, ...)
+void Sys_Error (const char *error, ...)
 {
        va_list argptr;
        char string[1024];
@@ -60,7 +77,7 @@ void Sys_Error (char *error, ...)
 
 }
 
-void Sys_Warn (char *warning, ...)
+void Sys_Warn (const char *warning, ...)
 {
        va_list argptr;
        char string[1024];
@@ -71,107 +88,16 @@ void Sys_Warn (char *warning, ...)
        fprintf(stderr, "Warning: %s", string);
 }
 
-/*
-============
-Sys_FileTime
-
-returns -1 if not present
-============
-*/
-int Sys_FileTime (char *path)
-{
-       struct stat buf;
-
-       if (stat (path,&buf) == -1)
-               return -1;
-
-       return buf.st_mtime;
-}
-
-
-void Sys_mkdir (char *path)
-{
-       mkdir (path, 0777);
-}
-
-int Sys_FileOpenRead (char *path, int *handle)
-{
-       int h;
-       struct stat fileinfo;
-
-       h = open (path, O_RDONLY, 0666);
-       *handle = h;
-       if (h == -1)
-               return -1;
-
-       if (fstat (h,&fileinfo) == -1)
-               Sys_Error ("Error fstating %s", path);
-
-       return fileinfo.st_size;
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-       int handle;
-
-       umask (0);
-
-       handle = open(path,O_RDWR | O_CREAT | O_TRUNC, 0666);
-
-       if (handle == -1)
-       {
-               Con_Printf("Sys_FileOpenWrite: Error opening %s: %s", path, strerror(errno));
-               return 0;
-       }
-
-       return handle;
-}
-
-int Sys_FileWrite (int handle, void *src, int count)
-{
-       return write (handle, src, count);
-}
-
-void Sys_FileClose (int handle)
-{
-       close (handle);
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-       lseek (handle, position, SEEK_SET);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-       return read (handle, dest, count);
-}
-
-void Sys_DebugLog(char *file, char *fmt, ...)
-{
-       va_list argptr;
-       static char data[1024];
-       int fd;
-
-       va_start(argptr, fmt);
-       vsprintf(data, fmt, argptr);
-       va_end(argptr);
-       fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0666);
-       write(fd, data, strlen(data));
-       close(fd);
-}
-
 double Sys_DoubleTime (void)
 {
        static int first = true;
        static double oldtime = 0.0, curtime = 0.0;
        double newtime;
        struct timeval tp;
-       struct timezone tzp;
 
-       gettimeofday(&tp, &tzp);
+       gettimeofday(&tp, NULL);
 
-       newtime = (double) ((unsigned long) tp.tv_sec) + tp.tv_usec/1000000.0;
+       newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0;
 
        if (first)
        {
@@ -180,12 +106,14 @@ double Sys_DoubleTime (void)
        }
 
        if (newtime < oldtime)
-               Con_Printf("Sys_DoubleTime: time running backwards??\n");
-       else
        {
-               curtime += newtime - oldtime;
-               oldtime = newtime;
+               // warn if it's significant
+               if (newtime - oldtime < -0.01)
+                       Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime);
        }
+       else
+               curtime += newtime - oldtime;
+       oldtime = newtime;
 
        return curtime;
 }
@@ -237,19 +165,14 @@ void Sys_Sleep(void)
        usleep(1);
 }
 
-int main (int c, char **v)
+int main (int argc, const char **argv)
 {
-       double oldtime, newtime;
+       double frameoldtime, framenewtime;
 
        signal(SIGFPE, SIG_IGN);
 
-       memset(&host_parms, 0, sizeof(host_parms));
-
-       COM_InitArgv(c, v);
-       host_parms.argc = com_argc;
-       host_parms.argv = com_argv;
-
-       host_parms.basedir = basedir;
+       com_argc = argc;
+       com_argv = argv;
 
        fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY);
 
@@ -259,15 +182,15 @@ int main (int c, char **v)
 
        Sys_Shared_LateInit();
 
-       oldtime = Sys_DoubleTime () - 0.1;
+       frameoldtime = Sys_DoubleTime () - 0.1;
        while (1)
        {
                // find time spent rendering last frame
-               newtime = Sys_DoubleTime ();
+               framenewtime = Sys_DoubleTime ();
 
-               Host_Frame (newtime - oldtime);
+               Host_Frame (framenewtime - frameoldtime);
 
-               oldtime = newtime;
+               frameoldtime = framenewtime;
        }
        return 0;
 }