X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=d291799ce7f5b9f3bafd91a60f248a5f62a601b3;hb=e23e10816221de25540362beb52e41a3ad8e4c49;hp=e196fe79ce167f064ccf6bd00be6b6a1edd7b90b;hpb=54c8d13c76444ca7e9d3f65229b5638cc67c3db5;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index e196fe79..d291799c 100644 --- a/host.c +++ b/host.c @@ -42,7 +42,6 @@ host_static_t host; // pretend frames take this amount of time (in seconds), 0 = realtime cvar_t host_framerate = {CF_CLIENT | CF_SERVER, "host_framerate","0", "locks frame timing to this value in seconds, 0.05 is 20fps for example, note that this can easily run too fast, use cl_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"}; -cvar_t cl_maxphysicsframesperserverframe = {CF_CLIENT, "cl_maxphysicsframesperserverframe","10", "maximum number of physics frames per server frame"}; // shows time used by certain subsystems cvar_t host_speeds = {CF_CLIENT | CF_SERVER, "host_speeds","0", "reports how much time is used in server/graphics/sound"}; cvar_t host_maxwait = {CF_CLIENT | CF_SERVER, "host_maxwait","1000", "maximum sleep time requested from the operating system in millisecond. Larger sleeps will be done using multiple host_maxwait length sleeps. Lowering this value will increase CPU load, but may help working around problems with accuracy of sleep times."}; @@ -90,6 +89,10 @@ void Host_Error (const char *error, ...) static char hosterrorstring2[MAX_INPUTLINE]; // THREAD UNSAFE static qbool hosterror = false; va_list argptr; + int outfd = sys.outfd; + + // set output to stderr + sys.outfd = fileno(stderr); // turn off rcon redirect if it was active when the crash occurred // to prevent loops when it is a networking problem @@ -110,7 +113,7 @@ void Host_Error (const char *error, ...) Sys_Error ("Host_Error: recursively entered (original error was: %s new error is: %s)", hosterrorstring2, hosterrorstring1); hosterror = true; - strlcpy(hosterrorstring2, hosterrorstring1, sizeof(hosterrorstring2)); + dp_strlcpy(hosterrorstring2, hosterrorstring1, sizeof(hosterrorstring2)); CL_Parse_DumpPacket(); @@ -134,11 +137,17 @@ void Host_Error (const char *error, ...) if (cls.state == ca_dedicated) Sys_Error ("Host_Error: %s",hosterrorstring2); // dedicated servers exit - CL_Disconnect (); + // prevent an endless loop if the error was triggered by a command + Cbuf_Clear(cmd_local->cbuf); + + CL_Disconnect(); cls.demonum = -1; hosterror = false; + // restore configured outfd + sys.outfd = outfd; + Host_AbortCurrentFrame(); } @@ -157,7 +166,7 @@ static void Host_Quit_f(cmd_state_t *cmd) static void Host_Version_f(cmd_state_t *cmd) { - Con_Printf("Version: %s build %s\n", gamename, buildstring); + Con_Printf("Version: %s\n", engineversion); } static void Host_Framerate_c(cvar_t *var) @@ -200,9 +209,11 @@ void Host_SaveConfig(const char *file) f = FS_OpenRealFile(file, "wb", false); if (!f) { - Con_Printf(CON_ERROR "Couldn't write %s.\n", file); + Con_Printf(CON_ERROR "Couldn't write %s\n", file); return; } + else + Con_Printf("Saving config to %s ...\n", file); Key_WriteBindings (f); Cvar_WriteVariables (&cvars_all, f); @@ -215,10 +226,8 @@ static void Host_SaveConfig_f(cmd_state_t *cmd) { const char *file = CONFIGFILENAME; - if(Cmd_Argc(cmd) >= 2) { + if(Cmd_Argc(cmd) >= 2) file = Cmd_Argv(cmd, 1); - Con_Printf("Saving to %s\n", file); - } Host_SaveConfig(file); } @@ -270,7 +279,6 @@ static void Host_InitLocal (void) Cmd_AddCommand(CF_SHARED, "saveconfig", Host_SaveConfig_f, "save settings to config.cfg (or a specified filename) immediately (also automatic when quitting)"); Cmd_AddCommand(CF_SHARED, "loadconfig", Host_LoadConfig_f, "reset everything and reload configs"); Cmd_AddCommand(CF_SHARED, "sendcvar", SendCvar_f, "sends the value of a cvar to the server as a sentcvar command, for use by QuakeC"); - Cvar_RegisterVariable (&cl_maxphysicsframesperserverframe); Cvar_RegisterVariable (&host_framerate); Cvar_RegisterCallback (&host_framerate, Host_Framerate_c); Cvar_RegisterVariable (&host_speeds); @@ -292,7 +300,6 @@ static void Host_InitLocal (void) char engineversion[128]; -qbool sys_nostdout = false; static qfile_t *locksession_fh = NULL; static qbool locksession_run = false; @@ -367,9 +374,12 @@ Host_Init static void Host_Init (void) { int i; - const char* os; char vabuf[1024]; + Sys_SDL_Init(); + + Memory_Init(); + host.hook.ConnectLocal = NULL; host.hook.Disconnect = NULL; host.hook.ToggleMenu = NULL; @@ -420,9 +430,9 @@ static void Host_Init (void) gl_printcheckerror.integer = 1;gl_printcheckerror.string = "1"; } -// COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from - if (Sys_CheckParm("-nostdout")) - sys_nostdout = 1; + // -dedicated is checked in SV_ServerOptions() but that's too late for Cvar_RegisterVariable() to skip all the client-only cvars + if (Sys_CheckParm ("-dedicated") || !cl_available) + cls.state = ca_dedicated; // initialize console command/cvar/alias/command execution systems Cmd_Init(); @@ -431,6 +441,7 @@ static void Host_Init (void) Memory_Init_Commands(); // initialize console and logging and its cvars/commands + // this enables Con_Printf() messages to be coloured Con_Init(); // initialize various cvars that could not be initialized earlier @@ -439,12 +450,11 @@ static void Host_Init (void) Sys_Init_Commands(); COM_Init_Commands(); - // initialize filesystem (including fs_basedir, fs_gamedir, -game, scr_screenshot_name) + // initialize filesystem (including fs_basedir, fs_gamedir, -game, scr_screenshot_name, gamename) FS_Init(); - // construct a version string for the corner of the console - os = DP_OS_NAME; - dpsnprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring); + // ASAP! construct a version string for the corner of the console and for crash messages + dpsnprintf (engineversion, sizeof (engineversion), "%s %s%s, buildstring: %s", gamename, DP_OS_NAME, cls.state == ca_dedicated ? " dedicated" : "", buildstring); Con_Printf("%s\n", engineversion); // initialize process nice level @@ -497,12 +507,16 @@ static void Host_Init (void) Log_Start(); - // put up the loading image so the user doesn't stare at a black screen... - SCR_BeginLoadingPlaque(true); -#ifdef CONFIG_MENU if (cls.state != ca_dedicated) + { + // put up the loading image so the user doesn't stare at a black screen... + SCR_BeginLoadingPlaque(true); + S_Startup(); +#ifdef CONFIG_MENU MR_Init(); #endif + } + // check for special benchmark mode // COMMANDLINEOPTION: Client: -benchmark runs a timedemo and quits, results of any timedemo can be found in gamedir/benchmark.log (for example id1/benchmark.log) i = Sys_CheckParm("-benchmark"); @@ -569,12 +583,12 @@ void Host_Shutdown(void) if (isdown) { - Con_Print("recursive shutdown\n"); + Con_Print(CON_WARN "recursive shutdown\n"); return; } if (setjmp(host.abortframe)) { - Con_Print("aborted the quitting frame?!?\n"); + Con_Print(CON_WARN "aborted the quitting frame?!?\n"); return; } isdown = true; @@ -602,7 +616,7 @@ void Host_Shutdown(void) TaskQueue_Shutdown(); Thread_Shutdown(); Cmd_Shutdown(); - Sys_Shutdown(); + Sys_SDL_Shutdown(); Log_Close(); Crypto_Shutdown(); @@ -638,56 +652,26 @@ static double Host_Frame(double time) // Run any downloads Curl_Frame(); + // get new SDL events and add commands from keybindings to the cbuf + Sys_SDL_HandleEvents(); + // process console commands Cbuf_Frame(host.cbuf); R_TimeReport("---"); - sv_wait = SV_Frame(time); - cl_wait = CL_Frame(time); - -// Con_Printf("%6.0f %6.0f\n", cl_wait * 1000000.0, sv_wait * 1000000.0); + // if the accumulators haven't become positive yet, wait a while + sv_wait = - SV_Frame(time); + cl_wait = - CL_Frame(time); Mem_CheckSentinelsGlobal(); - if(host.restless) - return 0; - - // if the accumulators haven't become positive yet, wait a while if (cls.state == ca_dedicated) - return sv_wait * -1000000.0; // dedicated + return sv_wait; // dedicated else if (!sv.active || svs.threaded) - return cl_wait * -1000000.0; // connected to server, main menu, or server is on different thread + return cl_wait; // connected to server, main menu, or server is on different thread else - return max(cl_wait, sv_wait) * -1000000.0; // listen server or singleplayer -} - -static inline void Host_Sleep(double time) -{ - double delta, time0; - - if(host_maxwait.value <= 0) - time = min(time, 1000000.0); - else - time = min(time, host_maxwait.value * 1000.0); - if(time < 1) - time = 1; // because we cast to int - - time0 = Sys_DirtyTime(); - if (sv_checkforpacketsduringsleep.integer && !sys_usenoclockbutbenchmark.integer && !svs.threaded) { - NetConn_SleepMicroseconds((int)time); - if (cls.state != ca_dedicated) - NetConn_ClientFrame(); // helps server browser get good ping values - // TODO can we do the same for ServerFrame? Probably not. - } - else - Sys_Sleep((int)time); - delta = Sys_DirtyTime() - time0; - if (delta < 0 || delta >= 1800) - delta = 0; - host.sleeptime += delta; -// R_TimeReport("sleep"); - return; + return min(cl_wait, sv_wait); // listen server or singleplayer } // Cloudwalk: Most overpowered function declaration... @@ -713,7 +697,7 @@ static inline double Host_UpdateTime (double newtime, double oldtime) void Host_Main(void) { - double time, newtime, oldtime, sleeptime; + double time, oldtime, sleeptime; Host_Init(); // Start! @@ -730,19 +714,14 @@ void Host_Main(void) continue; } - newtime = host.dirtytime = Sys_DirtyTime(); - host.realtime += time = Host_UpdateTime(newtime, oldtime); + host.dirtytime = Sys_DirtyTime(); + host.realtime += time = Host_UpdateTime(host.dirtytime, oldtime); + oldtime = host.dirtytime; sleeptime = Host_Frame(time); - oldtime = newtime; - - if (sleeptime >= 1) - { - Host_Sleep(sleeptime); - continue; - } - - host.framecount++; + ++host.framecount; + sleeptime -= Sys_DirtyTime() - host.dirtytime; // execution time + host.sleeptime = Sys_Sleep(sleeptime); } return;