X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sys_linux.c;h=d36b558854061086956e702110b8faa488372900;hb=a90e84271f385438c9ce8bd45513d83a26f98180;hp=cc2ef249b8f95646fd3e05f4e596d4ca09209fe4;hpb=4d162c39ec059b7f3191fbb4fb18304bc9b1db59;p=xonotic%2Fdarkplaces.git diff --git a/sys_linux.c b/sys_linux.c index cc2ef249..d36b5588 100644 --- a/sys_linux.c +++ b/sys_linux.c @@ -21,54 +21,10 @@ #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 - -extern cvar_t timestamps; -extern cvar_t timeformat; - -/* The translation table between the graphical font and plain ASCII --KB */ -static char qfont_table[256] = { - '\0', '#', '#', '#', '#', '.', '#', '#', - '#', 9, 10, '#', ' ', 13, '.', '.', - '[', ']', '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', '.', '<', '=', '>', - ' ', '!', '"', '#', '$', '%', '&', '\'', - '(', ')', '*', '+', ',', '-', '.', '/', - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', ':', ';', '<', '=', '>', '?', - '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', - 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', - 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', - 'X', 'Y', 'Z', '[', '\\', ']', '^', '_', - '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', - 'x', 'y', 'z', '{', '|', '}', '~', '<', - - '<', '=', '>', '#', '#', '.', '#', '#', - '#', '#', ' ', '#', ' ', '>', '.', '.', - '[', ']', '0', '1', '2', '3', '4', '5', - '6', '7', '8', '9', '.', '<', '=', '>', - ' ', '!', '"', '#', '$', '%', '&', '\'', - '(', ')', '*', '+', ',', '-', '.', '/', - '0', '1', '2', '3', '4', '5', '6', '7', - '8', '9', ':', ';', '<', '=', '>', '?', - '@', 'A', 'B', 'C', 'D', 'E', 'F', 'G', - 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', - 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', - 'X', 'Y', 'Z', '[', '\\', ']', '^', '_', - '`', 'a', 'b', 'c', 'd', 'e', 'f', 'g', - 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', - 'x', 'y', 'z', '{', '|', '}', '~', '<' -}; +#endif // ======================================================================= // General routines @@ -78,98 +34,15 @@ 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; - } - } - -} -*/ - -#define MAX_PRINT_MSG 4096 -void Sys_Printf (char *fmt, ...) -{ - va_list argptr; - char start[MAX_PRINT_MSG]; // String we started with - char stamp[MAX_PRINT_MSG]; // Time stamp - char final[MAX_PRINT_MSG]; // String we print - - time_t mytime = 0; - struct tm *local = NULL; - - unsigned char *p; - - va_start (argptr, fmt); - vsnprintf (start, sizeof(start), fmt, argptr); - va_end (argptr); - - if (nostdout) - return; - - if (timestamps.value) { - mytime = time (NULL); - local = localtime (&mytime); - strftime (stamp, sizeof (stamp), timeformat.string, local); - - snprintf (final, sizeof (final), "%s%s", stamp, start); - } else { - snprintf (final, sizeof (final), "%s", start); - } - - for (p = (unsigned char *) final; *p; p++) { - putc (qfont_table[*p], stdout); - } - fflush (stdout); -} - #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 r -egistered trademark licensed to \x1b[22;1H Nothing Interactive, Inc. All rights reserved. \x1b[40m\x1b[23;1H\x1b[0m"; +"\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. N -IN logo is a registered trademark licensed \x1b[22;1H to Nothing Interactive, Inc. All rights reserved. \x1b[23;1H\x1b[40m\x1b[0m"; - +"\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(); @@ -184,10 +57,6 @@ void Sys_Quit (void) exit(0); } -void Sys_Init(void) -{ -} - void Sys_Error (char *error, ...) { va_list argptr; @@ -263,11 +132,13 @@ int Sys_FileOpenWrite (char *path) 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; } @@ -307,44 +178,31 @@ void Sys_DebugLog(char *file, char *fmt, ...) close(fd); } -void Sys_EditFile(char *filename) +double Sys_DoubleTime (void) { + static int first = true; + static double oldtime = 0.0, basetime = 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 - basetime; + + 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; + basetime = newtime; + newtime = 0.0; } -} - -double Sys_FloatTime (void) -{ - struct timeval tp; - struct timezone tzp; - static int secbase; - - gettimeofday(&tp, &tzp); + if (newtime < oldtime) + Sys_Error("Sys_DoubleTime: time running backwards??\n"); - if (!secbase) - { - secbase = tp.tv_sec; - return tp.tv_usec/1000000.0; - } + oldtime = newtime; - return (tp.tv_sec - secbase) + tp.tv_usec/1000000.0; + return newtime; } // ======================================================================= @@ -358,10 +216,6 @@ void alarm_handler(int x) oktogo=1; } -void Sys_LineRefresh(void) -{ -} - void floating_point_exception_handler(int whatever) { // Sys_Warn("floating point exception\n"); @@ -393,12 +247,15 @@ char *Sys_ConsoleInput(void) return NULL; } +void Sys_Sleep(void) +{ + usleep(1); +} + int main (int c, char **v) { - double time, oldtime, newtime; - extern int vcrFile; - extern int recording; + double oldtime, newtime; // static char cwd[1024]; @@ -414,76 +271,22 @@ int main (int c, char **v) host_parms.memsize = DEFAULTMEM * 1024*1024; host_parms.basedir = basedir; -// caching is disabled by default, use -cachedir to enable -// host_parms.cachedir = cachedir; fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); Host_Init(); - Sys_Init(); - - if (COM_CheckParm("-nostdout")) - nostdout = 1; - else - { - fcntl(0, F_SETFL, fcntl (0, F_GETFL, 0) | FNDELAY); - printf ("Linux DarkPlaces -- Version %0.3f (build %i)\n", VERSION, buildnumber); - } + Sys_Shared_Init(); - 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; -} - - -/* -================ -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); + newtime = Sys_DoubleTime (); - r = mprotect((char*)addr, length + startaddr - addr + psize, 7); - - if (r < 0) - Sys_Error("Protection change failed\n"); + Host_Frame (newtime - oldtime); + oldtime = newtime; + } + return 0; } -