X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_linux.c;h=297289f28778cc348c6357ed177bdfd6be4c3f8a;hb=cca6f0cbe16bbb8d62d264bed54da2e6e6a7ed75;hp=30fba39b80eae267b1ee5a33e2f12e1061c74b2d;hpb=cecffffdd5310e387e8b910735ff77aa329cdb43;p=xonotic%2Fdarkplaces.git diff --git a/sys_linux.c b/sys_linux.c index 30fba39b..297289f2 100644 --- a/sys_linux.c +++ b/sys_linux.c @@ -1,32 +1,30 @@ -#include -#include #include -#include -#include +#include +#include + #include +#include #include #include -#include -#include + +#include +#include #include #include -#include -#include -#include +#include #include #include +#include +#include #include +#include #include "quakedef.h" -qboolean isDedicated; - -int nostdout = 0; - char *basedir = "."; +#if CACHEENABLE char *cachedir = "/tmp"; - -cvar_t sys_linerefresh = {"sys_linerefresh","0"};// set for entity display +#endif // ======================================================================= // General routines @@ -36,146 +34,42 @@ void Sys_DebugNumber(int y, int val) { } -/* -void Sys_Printf (char *fmt, ...) -{ - va_list argptr; - char text[1024]; - - va_start (argptr,fmt); - vsprintf (text,fmt,argptr); - va_end (argptr); - fprintf(stderr, "%s", text); - - Con_Print (text); -} - -void Sys_Printf (char *fmt, ...) -{ - - va_list argptr; - char text[1024], *t_p; - int l, r; - - if (nostdout) - return; - - va_start (argptr,fmt); - vsprintf (text,fmt,argptr); - va_end (argptr); - - l = strlen(text); - t_p = text; - -// make sure everything goes through, even though we are non-blocking - while (l) - { - r = write (1, text, l); - if (r != l) - sleep (0); - if (r > 0) - { - t_p += r; - l -= r; - } - } - -} -*/ - -char sysprintfbuf1[1024]; -char sysprintfbuf2[4096]; -char sysprintfhextable[] = "0123456789ABCDEF"; -void Sys_Printf (char *fmt, ...) -{ - va_list argptr; - char c, *o; - int i; - - va_start (argptr,fmt); - vsprintf (sysprintfbuf1,fmt,argptr); - va_end (argptr); - - if (strlen(sysprintfbuf1) > 1023) - Sys_Error("memory overwrite in Sys_Printf"); - - if (nostdout) - return; - - o = sysprintfbuf2; - for (i = 0;i < 1023 && sysprintfbuf1[i];i++) - { - c = sysprintfbuf1[i] & 0x7f; - if (c < 32 && c != 10 && c != 13 && c != 9) - { - *o++ = '['; - *o++ = sysprintfhextable[(c >> 4)]; - *o++ = sysprintfhextable[c & 0x0F]; - *o++ = ']'; - } - else - *o++ = c; - } - *o++ = 0; - puts(sysprintfbuf2); -} - -#if 0 -static char end1[] = -"\x1b[?7h\x1b[40m\x1b[2J\x1b[0;1;41m\x1b[1;1H QUAKE: The Doomed Dimension \x1b[33mby \x1b[44mid\x1b[41m Software \x1b[2;1H ---------------------------------------------------------------------------- \x1b[3;1H CALL 1-800-IDGAMES TO ORDER OR FOR TECHNICAL SUPPORT \x1b[4;1H PRICE: $45.00 (PRICES MAY VARY OUTSIDE THE US.) \x1b[5;1H \x1b[6;1H \x1b[37mYes! You only have one fourth of this incredible epic. That is because most \x1b[7;1H of you have paid us nothing or at most, very little. You could steal the \x1b[8;1H game from a friend. But we both know you'll be punished by God if you do. \x1b[9;1H \x1b[33mWHY RISK ETERNAL DAMNATION? CALL 1-800-IDGAMES AND BUY NOW! \x1b[10;1H \x1b[37mRemember, we love you almost as much as He does. \x1b[11;1H \x1b[12;1H \x1b[33mProgramming: \x1b[37mJohn Carmack, Michael Abrash, John Cash \x1b[13;1H \x1b[33mDesign: \x1b[37mJohn Romero, Sandy Petersen, American McGee, Tim Willits \x1b[14;1H \x1b[33mArt: \x1b[37mAdrian Carmack, Kevin Cloud \x1b[15;1H \x1b[33mBiz: \x1b[37mJay Wilbur, Mike Wilson, Donna Jackson \x1b[16;1H \x1b[33mProjects: \x1b[37mShawn Green \x1b[33mSupport: \x1b[37mBarrett Alexander \x1b[17;1H \x1b[33mSound Effects: \x1b[37mTrent Reznor and Nine Inch Nails \x1b[18;1H For other information or details on ordering outside the US, check out the \x1b[19;1H files accompanying QUAKE or our website at http://www.idsoftware.com. \x1b[20;1H \x1b[0;41mQuake is a trademark of Id Software, inc., (c)1996 Id Software, inc. \x1b[21;1H All rights reserved. NIN logo is a registered trademark licensed to \x1b[22;1H Nothing Interactive, Inc. All rights reserved. \x1b[40m\x1b[23;1H\x1b[0m"; -static char end2[] = -"\x1b[?7h\x1b[40m\x1b[2J\x1b[0;1;41m\x1b[1;1H QUAKE \x1b[33mby \x1b[44mid\x1b[41m Software \x1b[2;1H ----------------------------------------------------------------------------- \x1b[3;1H \x1b[37mWhy did you quit from the registered version of QUAKE? Did the \x1b[4;1H scary monsters frighten you? Or did Mr. Sandman tug at your \x1b[5;1H little lids? No matter! What is important is you love our \x1b[6;1H game, and gave us your money. Congratulations, you are probably \x1b[7;1H not a thief. \x1b[8;1H Thank You. \x1b[9;1H \x1b[33;44mid\x1b[41m Software is: \x1b[10;1H PROGRAMMING: \x1b[37mJohn Carmack, Michael Abrash, John Cash \x1b[11;1H \x1b[33mDESIGN: \x1b[37mJohn Romero, Sandy Petersen, American McGee, Tim Willits \x1b[12;1H \x1b[33mART: \x1b[37mAdrian Carmack, Kevin Cloud \x1b[13;1H \x1b[33mBIZ: \x1b[37mJay Wilbur, Mike Wilson \x1b[33mPROJECTS MAN: \x1b[37mShawn Green \x1b[14;1H \x1b[33mBIZ ASSIST: \x1b[37mDonna Jackson \x1b[33mSUPPORT: \x1b[37mBarrett Alexander \x1b[15;1H \x1b[33mSOUND EFFECTS AND MUSIC: \x1b[37mTrent Reznor and Nine Inch Nails \x1b[16;1H \x1b[17;1H If you need help running QUAKE refer to the text files in the \x1b[18;1H QUAKE directory, or our website at http://www.idsoftware.com. \x1b[19;1H If all else fails, call our technical support at 1-800-IDGAMES. \x1b[20;1H \x1b[0;41mQuake is a trademark of Id Software, inc., (c)1996 Id Software, inc. \x1b[21;1H All rights reserved. NIN logo is a registered trademark licensed \x1b[22;1H to Nothing Interactive, Inc. All rights reserved. \x1b[23;1H\x1b[40m\x1b[0m"; - -#endif void Sys_Quit (void) { Host_Shutdown(); - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); -#if 0 - if (registered.value) - printf("%s", end2); - else - printf("%s", end1); -#endif + fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); fflush(stdout); exit(0); } -void Sys_Init(void) -{ -#if id386 - Sys_SetFPCW(); -#endif -} - void Sys_Error (char *error, ...) -{ - va_list argptr; - char string[1024]; +{ + va_list argptr; + char string[1024]; // change stdin to non blocking - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); - - va_start (argptr,error); - vsprintf (string,error,argptr); - va_end (argptr); + fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~FNDELAY); + + va_start (argptr,error); + vsprintf (string,error,argptr); + va_end (argptr); fprintf(stderr, "Error: %s\n", string); Host_Shutdown (); exit (1); -} +} void Sys_Warn (char *warning, ...) -{ - va_list argptr; - char string[1024]; - - va_start (argptr,warning); - vsprintf (string,warning,argptr); - va_end (argptr); +{ + va_list argptr; + char string[1024]; + + va_start (argptr,warning); + vsprintf (string,warning,argptr); + va_end (argptr); fprintf(stderr, "Warning: %s", string); -} +} /* ============ @@ -184,33 +78,32 @@ Sys_FileTime returns -1 if not present ============ */ -int Sys_FileTime (char *path) +int Sys_FileTime (char *path) { - struct stat buf; - + struct stat buf; + if (stat (path,&buf) == -1) return -1; - + return buf.st_mtime; } void Sys_mkdir (char *path) { - mkdir (path, 0777); + mkdir (path, 0777); } int Sys_FileOpenRead (char *path, int *handle) { - int h; - struct stat fileinfo; - - + 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); @@ -219,15 +112,17 @@ int Sys_FileOpenRead (char *path, int *handle) int Sys_FileOpenWrite (char *path) { - int handle; + int handle; umask (0); - - handle = open(path,O_RDWR | O_CREAT | O_TRUNC - , 0666); + + handle = open(path,O_RDWR | O_CREAT | O_TRUNC, 0666); if (handle == -1) - Sys_Error ("Error opening %s: %s", path,strerror(errno)); + { + Con_Printf("Sys_FileOpenWrite: Error opening %s: %s", path, strerror(errno)); + return 0; + } return handle; } @@ -249,62 +144,48 @@ void Sys_FileSeek (int handle, int position) int Sys_FileRead (int handle, void *dest, int count) { - return read (handle, dest, 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_BINARY | O_CREAT | O_APPEND, 0666); - fd = open(file, O_WRONLY | O_CREAT | O_APPEND, 0666); - write(fd, data, strlen(data)); - close(fd); + 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); } -void Sys_EditFile(char *filename) +double Sys_DoubleTime (void) { + static int first = true; + static double oldtime = 0.0, curtime = 0.0; + double newtime; + struct timeval tp; + struct timezone tzp; - char cmd[256]; - char *term; - char *editor; + gettimeofday(&tp, &tzp); - term = getenv("TERM"); - if (term && !strcmp(term, "xterm")) + newtime = (double) ((unsigned long) tp.tv_sec) + tp.tv_usec/1000000.0; + + if (first) { - editor = getenv("VISUAL"); - if (!editor) - editor = getenv("EDITOR"); - if (!editor) - editor = getenv("EDIT"); - if (!editor) - editor = "vi"; - sprintf(cmd, "xterm -e %s %s", editor, filename); - system(cmd); + first = false; + oldtime = newtime; } -} + if (newtime < oldtime) + Con_Printf("Sys_DoubleTime: time running backwards??\n"); + else + curtime += newtime - oldtime; + oldtime = newtime; -double Sys_FloatTime (void) -{ - struct timeval tp; - struct timezone tzp; - static int secbase; - - gettimeofday(&tp, &tzp); - - if (!secbase) - { - secbase = tp.tv_sec; - return tp.tv_usec/1000000.0; - } - - return (tp.tv_sec - secbase) + tp.tv_usec/1000000.0; + return curtime; } // ======================================================================= @@ -318,24 +199,20 @@ void alarm_handler(int x) oktogo=1; } -void Sys_LineRefresh(void) -{ -} - void floating_point_exception_handler(int whatever) { -// Sys_Warn("floating point exception\n"); signal(SIGFPE, floating_point_exception_handler); } char *Sys_ConsoleInput(void) { - static char text[256]; - int len; - fd_set fdset; - struct timeval timeout; + static char text[256]; + int len; + fd_set fdset; + struct timeval timeout; - if (cls.state == ca_dedicated) { + if (cls.state == ca_dedicated) + { FD_ZERO(&fdset); FD_SET(0, &fdset); // stdin timeout.tv_sec = 0; @@ -353,119 +230,42 @@ char *Sys_ConsoleInput(void) return NULL; } -#if !id386 -void Sys_HighFPPrecision (void) +void Sys_Sleep(void) { + usleep(1); } -void Sys_LowFPPrecision (void) -{ -} -#endif - int main (int c, char **v) { + double oldtime, newtime; - double time, oldtime, newtime; - quakeparms_t parms; - extern int vcrFile; - extern int recording; - int j; - -// static char cwd[1024]; - -// signal(SIGFPE, floating_point_exception_handler); signal(SIGFPE, SIG_IGN); - memset(&parms, 0, sizeof(parms)); + memset(&host_parms, 0, sizeof(host_parms)); COM_InitArgv(c, v); - parms.argc = com_argc; - parms.argv = com_argv; - - parms.memsize = 24*1024*1024; - - j = COM_CheckParm("-mem"); - if (j) - parms.memsize = (int) (atof(com_argv[j+1]) * 1024 * 1024); - parms.membase = malloc (parms.memsize); - if (!parms.membase) - { - printf("Unable to allocate heap memory\n"); - return 1; - } + host_parms.argc = com_argc; + host_parms.argv = com_argv; - parms.basedir = basedir; -// caching is disabled by default, use -cachedir to enable -// parms.cachedir = cachedir; + host_parms.basedir = basedir; fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); - Host_Init(&parms); + Sys_Shared_EarlyInit(); - Sys_Init(); + Host_Init(); - if (COM_CheckParm("-nostdout")) - nostdout = 1; - else - { - fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); - printf ("Linux DarkPlaces -- Version %0.3f\n", VERSION); - } + Sys_Shared_LateInit(); - oldtime = Sys_FloatTime () - 0.1; + oldtime = Sys_DoubleTime () - 0.1; while (1) { // find time spent rendering last frame - newtime = Sys_FloatTime (); - time = newtime - oldtime; - - if (cls.state == ca_dedicated) - { // play vcrfiles at max speed - if (time < sys_ticrate.value && (vcrFile == -1 || recording) ) - { - usleep(1); - continue; // not time to run a server only tic yet - } - time = sys_ticrate.value; - } - - if (time > sys_ticrate.value*2) - oldtime = newtime; - else - oldtime += time; - - Host_Frame (time); - - // graphic debugging aids - if (sys_linerefresh.value) - Sys_LineRefresh (); - } - return 0; -} + newtime = Sys_DoubleTime (); + Host_Frame (newtime - oldtime); -/* -================ -Sys_MakeCodeWriteable -================ -*/ -void Sys_MakeCodeWriteable (unsigned long startaddr, unsigned long length) -{ - - int r; - unsigned long addr; - int psize = getpagesize(); - - addr = (startaddr & ~(psize-1)) - psize; - -// fprintf(stderr, "writable code %lx(%lx)-%lx, length=%lx\n", startaddr, -// addr, startaddr+length, length); - - r = mprotect((char*)addr, length + startaddr - addr + psize, 7); - - if (r < 0) - Sys_Error("Protection change failed\n"); - + oldtime = newtime; + } + return 0; } -