X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=8ba2f272b3dd72eb41eeb3a06ba4ec3f3fcf5f2a;hb=192f3b2adfdffb9047e4176820e86bfc42b32a8a;hp=1bba0f9e9b83f86b9b8a7cc3c16961cdb5616e84;hpb=775c0f6d056c37d2e23f9a96ec827023fe5e3404;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index 1bba0f9e..8ba2f272 100644 --- a/host.c +++ b/host.c @@ -1,5 +1,6 @@ /* Copyright (C) 1996-1997 Id Software, Inc. +Copyright (C) 2000-2021 DarkPlaces contributors This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -37,11 +38,10 @@ Memory is cleared / released when a server or client begins, not when they end. */ -host_t host; +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."}; @@ -68,7 +68,6 @@ Host_AbortCurrentFrame aborts the current host frame and goes on with the next one ================ */ -void Host_AbortCurrentFrame(void) DP_FUNC_NORETURN; void Host_AbortCurrentFrame(void) { // in case we were previously nice, make us mean again @@ -128,14 +127,16 @@ void Host_Error (const char *error, ...) Cvar_SetValueQuick(&csqc_progcrc, -1); Cvar_SetValueQuick(&csqc_progsize, -1); - SV_LockThreadMutex(); - SV_Shutdown (); - SV_UnlockThreadMutex(); + if(host.hook.SV_Shutdown) + host.hook.SV_Shutdown(); 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; @@ -158,7 +159,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) @@ -182,44 +183,6 @@ static void SendCvar_f(cmd_state_t *cmd) } } -/* -======================= -Host_InitLocal -====================== -*/ -void Host_SaveConfig_f(cmd_state_t *cmd); -void Host_LoadConfig_f(cmd_state_t *cmd); -extern cvar_t sv_writepicture_quality; -extern cvar_t r_texture_jpeg_fastpicmip; -static void Host_InitLocal (void) -{ - Cmd_AddCommand(CF_SHARED, "quit", Host_Quit_f, "quit the game"); - Cmd_AddCommand(CF_SHARED, "version", Host_Version_f, "print engine version"); - 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); - Cvar_RegisterVariable (&host_maxwait); - Cvar_RegisterVariable (&host_isclient); - - Cvar_RegisterVariable (&developer); - Cvar_RegisterVariable (&developer_extra); - Cvar_RegisterVariable (&developer_insane); - Cvar_RegisterVariable (&developer_loadfile); - Cvar_RegisterVariable (&developer_loading); - Cvar_RegisterVariable (&developer_entityparsing); - - Cvar_RegisterVariable (×tamps); - Cvar_RegisterVariable (&timeformat); - - Cvar_RegisterVariable (&sv_writepicture_quality); - Cvar_RegisterVariable (&r_texture_jpeg_fastpicmip); -} - - /* =============== Host_SaveConfig_f @@ -227,7 +190,7 @@ Host_SaveConfig_f Writes key bindings and archived cvars to config.cfg =============== */ -static void Host_SaveConfig_to(const char *file) +void Host_SaveConfig(const char *file) { qfile_t *f; @@ -249,11 +212,8 @@ static void Host_SaveConfig_to(const char *file) FS_Close (f); } } -void Host_SaveConfig(void) -{ - Host_SaveConfig_to(CONFIGFILENAME); -} -void Host_SaveConfig_f(cmd_state_t *cmd) + +static void Host_SaveConfig_f(cmd_state_t *cmd) { const char *file = CONFIGFILENAME; @@ -262,7 +222,7 @@ void Host_SaveConfig_f(cmd_state_t *cmd) Con_Printf("Saving to %s\n", file); } - Host_SaveConfig_to(file); + Host_SaveConfig(file); } static void Host_AddConfigText(cmd_state_t *cmd) @@ -287,7 +247,7 @@ Host_LoadConfig_f Resets key bindings and cvars to defaults and then reloads scripts =============== */ -void Host_LoadConfig_f(cmd_state_t *cmd) +static void Host_LoadConfig_f(cmd_state_t *cmd) { // reset all cvars, commands and aliases to init values Cmd_RestoreInitState(); @@ -299,157 +259,38 @@ void Host_LoadConfig_f(cmd_state_t *cmd) Host_AddConfigText(cmd_local); } -//============================================================================ - -/* -================== -Host_TimeReport - -Returns a time report string, for example for -================== -*/ -const char *Host_TimingReport(char *buf, size_t buflen) -{ - return va(buf, buflen, "%.1f%% CPU, %.2f%% lost, offset avg %.1fms, max %.1fms, sdev %.1fms", svs.perf_cpuload * 100, svs.perf_lost * 100, svs.perf_offset_avg * 1000, svs.perf_offset_max * 1000, svs.perf_offset_sdev * 1000); -} - /* -================== -Host_Frame - -Runs all active servers -================== +======================= +Host_InitLocal +====================== */ -static void Host_Init(void); -double Host_Frame(double time) -{ - double cl_wait, sv_wait; - - TaskQueue_Frame(false); - - // keep the random time dependent, but not when playing demos/benchmarking - if(!*sv_random_seed.string && !host.restless) - rand(); - - NetConn_UpdateSockets(); - - Log_DestBuffer_Flush(); - - // Run any downloads - Curl_Frame(); - - // 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); - - 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 - else if (!sv.active || svs.threaded) - return cl_wait * -1000000.0; // 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; -} - -// Cloudwalk: Most overpowered function declaration... -static inline double Host_UpdateTime (double newtime, double oldtime) -{ - double time = newtime - oldtime; - - if (time < 0) - { - // warn if it's significant - if (time < -0.01) - Con_Printf(CON_WARN "Host_UpdateTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, time); - time = 0; - } - else if (time >= 1800) - { - Con_Printf(CON_WARN "Host_UpdateTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, time); - time = 0; - } - - return time; -} - -void Host_Main(void) +extern cvar_t r_texture_jpeg_fastpicmip; +static void Host_InitLocal (void) { - double time, newtime, oldtime, sleeptime; - - Host_Init(); // Start! - - host.realtime = 0; - oldtime = Sys_DirtyTime(); - - // Main event loop - while(host.state != host_shutdown) - { - // Something bad happened, or the server disconnected - if (setjmp(host.abortframe)) - { - host.state = host_active; // In case we were loading - continue; - } - - newtime = host.dirtytime = Sys_DirtyTime(); - host.realtime += time = Host_UpdateTime(newtime, oldtime); - - sleeptime = Host_Frame(time); - oldtime = newtime; + Cmd_AddCommand(CF_SHARED, "quit", Host_Quit_f, "quit the game"); + Cmd_AddCommand(CF_SHARED, "version", Host_Version_f, "print engine version"); + 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 (&host_framerate); + Cvar_RegisterCallback (&host_framerate, Host_Framerate_c); + Cvar_RegisterVariable (&host_speeds); + Cvar_RegisterVariable (&host_maxwait); + Cvar_RegisterVariable (&host_isclient); - if (sleeptime >= 1) - { - Host_Sleep(sleeptime); - continue; - } + Cvar_RegisterVariable (&developer); + Cvar_RegisterVariable (&developer_extra); + Cvar_RegisterVariable (&developer_insane); + Cvar_RegisterVariable (&developer_loadfile); + Cvar_RegisterVariable (&developer_loading); + Cvar_RegisterVariable (&developer_entityparsing); - host.framecount++; - } + Cvar_RegisterVariable (×tamps); + Cvar_RegisterVariable (&timeformat); - return; + Cvar_RegisterVariable (&r_texture_jpeg_fastpicmip); } -//============================================================================ - char engineversion[128]; qbool sys_nostdout = false; @@ -476,6 +317,7 @@ static void Host_InitSession(void) } } } + void Host_LockSession(void) { if(locksession_run) @@ -501,6 +343,7 @@ void Host_LockSession(void) } } } + void Host_UnlockSession(void) { if(!locksession_run) @@ -525,14 +368,17 @@ 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; host.hook.CL_Intermission = NULL; - host.hook.SV_CanSave = NULL; + host.hook.SV_Shutdown = NULL; host.state = host_init; @@ -582,6 +428,10 @@ static void Host_Init (void) 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(); @@ -601,8 +451,7 @@ static void Host_Init (void) 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); + 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 @@ -655,12 +504,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"); @@ -713,7 +566,6 @@ static void Host_Init (void) SV_StartThread(); } - /* =============== Host_Shutdown @@ -746,14 +598,13 @@ void Host_Shutdown(void) SV_StopThread(); // shut down local server if active - SV_LockThreadMutex(); - SV_Shutdown (); - SV_UnlockThreadMutex(); + if(host.hook.SV_Shutdown) + host.hook.SV_Shutdown(); // AK shutdown PRVM // AK hmm, no PRVM_Shutdown(); yet - Host_SaveConfig(); + Host_SaveConfig(CONFIGFILENAME); Curl_Shutdown (); NetConn_Shutdown (); @@ -772,6 +623,103 @@ void Host_Shutdown(void) Memory_Shutdown(); } -void Host_NoOperation_f(cmd_state_t *cmd) +//============================================================================ + +/* +================== +Host_Frame + +Runs all active servers +================== +*/ +static double Host_Frame(double time) +{ + double cl_wait, sv_wait; + + TaskQueue_Frame(false); + + // keep the random time dependent, but not when playing demos/benchmarking + if(!*sv_random_seed.string && !host.restless) + rand(); + + NetConn_UpdateSockets(); + + Log_DestBuffer_Flush(); + + // 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("---"); + + // if the accumulators haven't become positive yet, wait a while + sv_wait = - SV_Frame(time); + cl_wait = - CL_Frame(time); + + Mem_CheckSentinelsGlobal(); + + if (cls.state == ca_dedicated) + return sv_wait; // dedicated + else if (!sv.active || svs.threaded) + return cl_wait; // connected to server, main menu, or server is on different thread + else + return min(cl_wait, sv_wait); // listen server or singleplayer +} + +// Cloudwalk: Most overpowered function declaration... +static inline double Host_UpdateTime (double newtime, double oldtime) +{ + double time = newtime - oldtime; + + if (time < 0) + { + // warn if it's significant + if (time < -0.01) + Con_Printf(CON_WARN "Host_UpdateTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, time); + time = 0; + } + else if (time >= 1800) + { + Con_Printf(CON_WARN "Host_UpdateTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, time); + time = 0; + } + + return time; +} + +void Host_Main(void) { + double time, oldtime, sleeptime; + + Host_Init(); // Start! + + host.realtime = 0; + oldtime = Sys_DirtyTime(); + + // Main event loop + while(host.state != host_shutdown) + { + // Something bad happened, or the server disconnected + if (setjmp(host.abortframe)) + { + host.state = host_active; // In case we were loading + continue; + } + + host.dirtytime = Sys_DirtyTime(); + host.realtime += time = Host_UpdateTime(host.dirtytime, oldtime); + oldtime = host.dirtytime; + + sleeptime = Host_Frame(time); + ++host.framecount; + sleeptime -= Sys_DirtyTime() - host.dirtytime; // execution time + host.sleeptime = Sys_Sleep(sleeptime); + } + + return; }