X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_linux.c;h=148f540bb91e2f4bc5cf4c02b4f1b0eb028d9790;hp=297289f28778cc348c6357ed177bdfd6be4c3f8a;hb=ebd79ac26160a878c6f0d4a9736361e0b7f549d4;hpb=098645b2466ede85e63e5d5372d2d8e725ed12ee diff --git a/sys_linux.c b/sys_linux.c index 297289f2..148f540b 100644 --- a/sys_linux.c +++ b/sys_linux.c @@ -1,54 +1,81 @@ -#include -#include -#include -#include -#include +#ifdef WIN32 +#include "conio.h" +#else #include #include +#include +#include +#endif #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "quakedef.h" -char *basedir = "."; -#if CACHEENABLE -char *cachedir = "/tmp"; + +#ifdef WIN32 +cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"}; #endif -// ======================================================================= -// General routines -// ======================================================================= +/* +=============================================================================== + +DLL MANAGEMENT + +=============================================================================== +*/ -void Sys_DebugNumber(int y, int val) +dllhandle_t Sys_LoadLibrary (const char* name) { +#ifdef WIN32 + return LoadLibrary (name); +#else + return dlopen (name, RTLD_LAZY); +#endif } +void Sys_UnloadLibrary (dllhandle_t handle) +{ +#ifdef WIN32 + FreeLibrary (handle); +#else + dlclose (handle); +#endif +} + +void* Sys_GetProcAddress (dllhandle_t handle, const char* name) +{ +#ifdef WIN32 + return (void *)GetProcAddress (handle, name); +#else + return (void *)dlsym (handle, name); +#endif +} + + +// ======================================================================= +// General routines +// ======================================================================= + void Sys_Quit (void) { Host_Shutdown(); +#ifndef WIN32 fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); +#endif fflush(stdout); exit(0); } -void Sys_Error (char *error, ...) +void Sys_Error (const char *error, ...) { va_list argptr; char string[1024]; // change stdin to non blocking +#ifndef WIN32 fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); +#endif va_start (argptr,error); vsprintf (string,error,argptr); @@ -60,118 +87,64 @@ void Sys_Error (char *error, ...) } -void Sys_Warn (char *warning, ...) -{ - va_list argptr; - char string[1024]; - - va_start (argptr,warning); - vsprintf (string,warning,argptr); - va_end (argptr); - 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; +#ifdef WIN32 + // LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine. + if (sys_usetimegettime.integer) + { + static int firsttimegettime = true; + // timeGetTime + // platform: + // Windows 95/98/ME/NT/2000/XP + // features: + // reasonable accuracy (millisecond) + // issues: + // wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter) + + // make sure the timer is high precision, otherwise different versions of windows have varying accuracy + if (firsttimegettime) + { + timeBeginPeriod (1); + firsttimegettime = false; + } + + newtime = (double) timeGetTime () / 1000.0; + } + else + { + // QueryPerformanceCounter + // platform: + // Windows 95/98/ME/NT/2000/XP + // features: + // very accurate (CPU cycles) + // known issues: + // does not necessarily match realtime too well (tends to get faster and faster in win98) + // wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors) + double timescale; + LARGE_INTEGER PerformanceFreq; + LARGE_INTEGER PerformanceCount; + + if (!QueryPerformanceFrequency (&PerformanceFreq)) + Sys_Error ("No hardware timer available"); + QueryPerformanceCounter (&PerformanceCount); + + #ifdef __BORLANDC__ + timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0); + newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale; + #else + timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0); + newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale; + #endif + } +#else struct timeval tp; - struct timezone tzp; - - gettimeofday(&tp, &tzp); - - newtime = (double) ((unsigned long) tp.tv_sec) + tp.tv_usec/1000000.0; + gettimeofday(&tp, NULL); + newtime = (double) tp.tv_sec + tp.tv_usec / 1000000.0; +#endif if (first) { @@ -180,7 +153,11 @@ double Sys_DoubleTime (void) } if (newtime < oldtime) - Con_Printf("Sys_DoubleTime: time running backwards??\n"); + { + // 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; @@ -188,68 +165,87 @@ double Sys_DoubleTime (void) return curtime; } -// ======================================================================= -// Sleeps for microseconds -// ======================================================================= - -static volatile int oktogo; - -void alarm_handler(int x) -{ - oktogo=1; -} - -void floating_point_exception_handler(int whatever) -{ - signal(SIGFPE, floating_point_exception_handler); -} - char *Sys_ConsoleInput(void) { - static char text[256]; - int len; - fd_set fdset; - struct timeval timeout; - if (cls.state == ca_dedicated) { + static char text[256]; + int len; +#ifdef WIN32 + int c; + + // read a line out + while (_kbhit ()) + { + c = _getch (); + putch (c); + if (c == '\r') + { + text[len] = 0; + putch ('\n'); + len = 0; + return text; + } + if (c == 8) + { + if (len) + { + putch (' '); + putch (c); + len--; + text[len] = 0; + } + continue; + } + text[len] = c; + len++; + text[len] = 0; + if (len == sizeof (text)) + len = 0; + } +#else + fd_set fdset; + struct timeval timeout; FD_ZERO(&fdset); FD_SET(0, &fdset); // stdin timeout.tv_sec = 0; timeout.tv_usec = 0; - if (select (1, &fdset, NULL, NULL, &timeout) == -1 || !FD_ISSET(0, &fdset)) - return NULL; - - len = read (0, text, sizeof(text)); - if (len < 1) - return NULL; - text[len-1] = 0; // rip off the /n and terminate - - return text; + if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset)) + { + len = read (0, text, sizeof(text)); + if (len >= 1) + { + // rip off the \n and terminate + text[len-1] = 0; + return text; + } + } +#endif } return NULL; } void Sys_Sleep(void) { +#ifdef WIN32 + Sleep (1); +#else usleep(1); +#endif } -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; +#ifndef WIN32 fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); +#endif Sys_Shared_EarlyInit(); @@ -257,15 +253,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; }