X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sys_shared.c;h=26bd27c25e440a57bef9fe50d3632c72bedddd0b;hb=01642af37128bffc1accbf2e92cb2428ea570720;hp=e92eb94f71296215231e8fa58e41199245f51a08;hpb=3dec4376ce1b06989ff9ac0cced50d26c7012888;p=xonotic%2Fdarkplaces.git diff --git a/sys_shared.c b/sys_shared.c index e92eb94f..26bd27c2 100644 --- a/sys_shared.c +++ b/sys_shared.c @@ -38,6 +38,11 @@ #include "thread.h" #include "libcurl.h" +#ifdef WIN32 + // Microsoft's compiler complains about portable code + #pragma warning(disable : 4996) +#endif + sys_t sys; static char sys_timestring[128]; @@ -71,10 +76,13 @@ void Sys_Quit (int returnvalue) #ifdef __ANDROID__ Sys_AllowProfiling(false); #endif + #ifndef WIN32 - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK); + fcntl(fileno(stdout), F_SETFL, fcntl(fileno(stdout), F_GETFL, 0) & ~O_NONBLOCK); + fcntl(fileno(stderr), F_SETFL, fcntl(fileno(stderr), F_GETFL, 0) & ~O_NONBLOCK); #endif fflush(stdout); + fflush(stderr); exit(returnvalue); } @@ -205,13 +213,13 @@ notfound: if (!dllhandle && strrchr(sys.argv[0], '/')) { char path[MAX_OSPATH]; - strlcpy(path, sys.argv[0], sizeof(path)); + dp_strlcpy(path, sys.argv[0], sizeof(path)); strrchr(path, '/')[1] = 0; for (i = 0; dllnames[i] != NULL; i++) { char temp[MAX_OSPATH]; - strlcpy(temp, path, sizeof(temp)); - strlcat(temp, dllnames[i], sizeof(temp)); + dp_strlcpy(temp, path, sizeof(temp)); + dp_strlcat(temp, dllnames[i], sizeof(temp)); Con_DPrintf (" \"%s\"", temp); if(Sys_LoadLibrary(temp, &dllhandle)) @@ -329,6 +337,11 @@ static cvar_t sys_usequeryperformancecounter = {CF_SHARED | CF_ARCHIVE, "sys_use static cvar_t sys_useclockgettime = {CF_SHARED | CF_ARCHIVE, "sys_useclockgettime", "1", "use POSIX clock_gettime function (not adjusted by NTP on some older Linux kernels) for timing rather than gettimeofday (which has issues if the system time is stepped by ntpdate, or apparently on some Xen installations)"}; #endif +static cvar_t sys_stdout = {CF_SHARED, "sys_stdout", "1", "0: nothing is written to stdout (-nostdout cmdline option sets this), 1: normal messages are written to stdout, 2: normal messages are written to stderr (-stderr cmdline option sets this)"}; +#ifndef WIN32 +static cvar_t sys_stdout_blocks = {CF_SHARED, "sys_stdout_blocks", "0", "1: writes to stdout and stderr streams will block (causing a stutter or complete halt) if the buffer is full, ensuring no messages are lost at a price"}; +#endif + static double benchmark_time; // actually always contains an integer amount of milliseconds, will eventually "overflow" /* @@ -354,6 +367,17 @@ int Sys_CheckParm (const char *parm) return 0; } +static void Sys_UpdateOutFD_c(cvar_t *var) +{ + switch (sys_stdout.integer) + { + case 0: sys.outfd = -1; break; + default: + case 1: sys.outfd = fileno(stdout); break; + case 2: sys.outfd = fileno(stderr); break; + } +} + void Sys_Init_Commands (void) { Cvar_RegisterVariable(&sys_debugsleep); @@ -371,6 +395,11 @@ void Sys_Init_Commands (void) #endif #if HAVE_CLOCKGETTIME Cvar_RegisterVariable(&sys_useclockgettime); +#endif + Cvar_RegisterVariable(&sys_stdout); + Cvar_RegisterCallback(&sys_stdout, Sys_UpdateOutFD_c); +#ifndef WIN32 + Cvar_RegisterVariable(&sys_stdout_blocks); #endif } @@ -567,7 +596,7 @@ STDIO =============================================================================== */ -void Sys_Print(const char *text) +void Sys_Print(const char *text, size_t textlen) { #ifdef __ANDROID__ if (developer.integer > 0) @@ -581,37 +610,40 @@ void Sys_Print(const char *text) // BUG: for some reason, NDELAY also affects stdout (1) when used on stdin (0). // this is because both go to /dev/tty by default! { - int origflags = fcntl (sys.outfd, F_GETFL, 0); - fcntl (sys.outfd, F_SETFL, origflags & ~O_NONBLOCK); + int origflags = fcntl(sys.outfd, F_GETFL, 0); + if (sys_stdout_blocks.integer) + fcntl(sys.outfd, F_SETFL, origflags & ~O_NONBLOCK); #else #define write _write #endif while(*text) { - fs_offset_t written = (fs_offset_t)write(sys.outfd, text, (int)strlen(text)); + fs_offset_t written = (fs_offset_t)write(sys.outfd, text, textlen); if(written <= 0) break; // sorry, I cannot do anything about this error - without an output text += written; } #ifndef WIN32 - fcntl (sys.outfd, F_SETFL, origflags); + if (sys_stdout_blocks.integer) + fcntl(sys.outfd, F_SETFL, origflags); } #endif //fprintf(stdout, "%s", text); #endif } -/// for the console to report failures inside Con_Printf() void Sys_Printf(const char *fmt, ...) { va_list argptr; char msg[MAX_INPUTLINE]; + int msglen; va_start(argptr,fmt); - dpvsnprintf(msg,sizeof(msg),fmt,argptr); + msglen = dpvsnprintf(msg, sizeof(msg), fmt, argptr); va_end(argptr); - Sys_Print(msg); + if (msglen >= 0) + Sys_Print(msg, msglen); } /// Reads a line from POSIX stdin or the Windows console @@ -677,9 +709,10 @@ void Sys_Error (const char *error, ...) va_list argptr; char string[MAX_INPUTLINE]; -// change stdin to non blocking + // set output to blocking stderr + sys.outfd = fileno(stderr); #ifndef WIN32 - fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) & ~O_NONBLOCK); + fcntl(sys.outfd, F_SETFL, fcntl(sys.outfd, F_GETFL, 0) & ~O_NONBLOCK); #endif va_start (argptr,error); @@ -693,6 +726,8 @@ void Sys_Error (const char *error, ...) Sys_SDL_Dialog("Engine Error", string); + fflush(stderr); + exit (1); } @@ -918,10 +953,16 @@ static void Sys_HandleCrash(int sig) default: sigdesc = "Yo dawg, we hit a bug while hitting a bug"; } + // set output to blocking stderr + sys.outfd = fileno(stderr); +#ifndef WIN32 + fcntl(sys.outfd, F_SETFL, fcntl(sys.outfd, F_GETFL, 0) & ~O_NONBLOCK); +#endif + fprintf(stderr, "\n\n\e[1;37;41m Engine Crash: %s (%d) \e[m\n", sigdesc, sig); #if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 // the first two addresses will be in this function and in signal() in libc - backtrace_symbols_fd(stackframes + 2, framecount - 2, fileno(stderr)); + backtrace_symbols_fd(stackframes + 2, framecount - 2, sys.outfd); #endif fprintf(stderr, "\e[1m%s\e[m\n", engineversion); @@ -933,6 +974,8 @@ static void Sys_HandleCrash(int sig) Sys_SDL_Dialog("Engine Crash", sigdesc); + fflush(stderr); + exit (sig); } @@ -970,22 +1013,26 @@ int main (int argc, char **argv) sys.argc = argc; sys.argv = (const char **)argv; + // COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from // COMMANDLINEOPTION: -noterminal disables console output on stdout - if(Sys_CheckParm("-noterminal")) - sys.outfd = -1; + if(Sys_CheckParm("-noterminal") || Sys_CheckParm("-nostdout")) + sys_stdout.string = "0"; // COMMANDLINEOPTION: -stderr moves console output to stderr else if(Sys_CheckParm("-stderr")) - sys.outfd = 2; - else - sys.outfd = 1; + sys_stdout.string = "2"; + // too early for Cvar_SetQuick + sys_stdout.value = sys_stdout.integer = atoi(sys_stdout.string); + Sys_UpdateOutFD_c(&sys_stdout); +#ifndef WIN32 + fcntl(fileno(stdin), F_SETFL, fcntl(fileno(stdin), F_GETFL, 0) | O_NONBLOCK); + // stdout/stderr will be set to blocking in Sys_Print() if so configured, or during a fatal error. + fcntl(fileno(stdout), F_SETFL, fcntl(fileno(stdout), F_GETFL, 0) | O_NONBLOCK); + fcntl(fileno(stderr), F_SETFL, fcntl(fileno(stderr), F_GETFL, 0) | O_NONBLOCK); +#endif sys.selffd = -1; Sys_ProvideSelfFD(); // may call Con_Printf() so must be after sys.outfd is set -#ifndef WIN32 - fcntl(fileno(stdin), F_SETFL, fcntl (fileno(stdin), F_GETFL, 0) | O_NONBLOCK); -#endif - #ifdef __ANDROID__ Sys_AllowProfiling(true); #endif