X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=host.c;h=3c5dfe748aae9c91a0b03755044df6c8ef7403c0;hp=afce873dd0cc686f63adf1487527198ad9179662;hb=32bea9b074a4ee3e82fe0bbe82005da9f2d6f418;hpb=f800c0a37d45e51883f60e2751eb930251a7a903 diff --git a/host.c b/host.c index afce873d..3c5dfe74 100644 --- a/host.c +++ b/host.c @@ -29,6 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "progsvm.h" #include "csprogs.h" #include "sv_demo.h" +#include "snd_main.h" /* @@ -60,7 +61,6 @@ double host_starttime = 0; cvar_t host_framerate = {0, "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"}; // shows time used by certain subsystems cvar_t host_speeds = {0, "host_speeds","0", "reports how much time is used in server/graphics/sound"}; -cvar_t host_sleep = {0, "host_sleep","0", "gives up some processing time to other applications each frame, value in milliseconds"}; cvar_t cl_minfps = {CVAR_SAVE, "cl_minfps", "40", "minimum fps target - while the rendering performance is below this, it will drift toward lower quality"}; cvar_t cl_minfps_fade = {CVAR_SAVE, "cl_minfps_fade", "0.2", "how fast the quality adapts to varying framerate"}; cvar_t cl_minfps_qualitymax = {CVAR_SAVE, "cl_minfps_qualitymax", "1", "highest allowed drawdistance multiplier"}; @@ -68,9 +68,12 @@ cvar_t cl_minfps_qualitymin = {CVAR_SAVE, "cl_minfps_qualitymin", "0.25", "lowes cvar_t cl_minfps_qualitypower = {CVAR_SAVE, "cl_minfps_qualitypower", "4", "raises quality value to a power of itself, higher values make quality drop more sharply in relation to framerate"}; cvar_t cl_minfps_qualityscale = {CVAR_SAVE, "cl_minfps_qualityscale", "0.5", "multiplier for quality"}; cvar_t cl_maxfps = {CVAR_SAVE, "cl_maxfps", "0", "maximum fps cap, 0 = unlimited, if game is running faster than this it will wait before running another frame (useful to make cpu time available to other programs)"}; +cvar_t cl_maxfps_alwayssleep = {0, "cl_maxfps_alwayssleep","1", "gives up some processing time to other applications each frame, value in milliseconds, disabled if cl_maxfps is 0"}; cvar_t cl_maxidlefps = {CVAR_SAVE, "cl_maxidlefps", "20", "maximum fps cap when the game is not the active window (makes cpu time available to other programs"}; -cvar_t developer = {0, "developer","0", "prints additional debugging messages and information (recommended for modders and level designers)"}; +cvar_t developer = {CVAR_SAVE, "developer","0", "prints debugging messages and information (recommended for all developers and level designers)"}; +cvar_t developer_extra = {0, "developer_extra", "0", "prints additional debugging messages, often very verbose!"}; +cvar_t developer_insane = {0, "developer_insane", "0", "prints huge streams of information about internal workings, entire contents of files being read/written, etc. Not recommended!"}; cvar_t developer_loadfile = {0, "developer_loadfile","0", "prints name and size of every file loaded via the FS_LoadFile function (which is almost everything)"}; cvar_t developer_loading = {0, "developer_loading","0", "prints information about files as they are loaded or unloaded successfully"}; cvar_t developer_entityparsing = {0, "developer_entityparsing", "0", "prints detailed network entities information each time a packet is received"}; @@ -213,7 +216,6 @@ static void Host_InitLocal (void) Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); - Cvar_RegisterVariable (&host_sleep); Cvar_RegisterVariable (&cl_minfps); Cvar_RegisterVariable (&cl_minfps_fade); Cvar_RegisterVariable (&cl_minfps_qualitymax); @@ -221,9 +223,12 @@ static void Host_InitLocal (void) Cvar_RegisterVariable (&cl_minfps_qualitypower); Cvar_RegisterVariable (&cl_minfps_qualityscale); Cvar_RegisterVariable (&cl_maxfps); + Cvar_RegisterVariable (&cl_maxfps_alwayssleep); Cvar_RegisterVariable (&cl_maxidlefps); Cvar_RegisterVariable (&developer); + Cvar_RegisterVariable (&developer_extra); + Cvar_RegisterVariable (&developer_insane); Cvar_RegisterVariable (&developer_loadfile); Cvar_RegisterVariable (&developer_loading); Cvar_RegisterVariable (&developer_entityparsing); @@ -535,6 +540,7 @@ void Host_ShutdownServer(void) // make sure all the clients know we're disconnecting SV_VM_Begin(); + World_End(&sv.world); if(prog->loaded) if(prog->funcoffsets.SV_Shutdown) { @@ -587,7 +593,7 @@ Host_TimeReport Returns a time report string, for example for ================== */ -const char *Host_TimingReport() +const char *Host_TimingReport(void) { return va("%.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); } @@ -654,7 +660,7 @@ void Host_Main(void) svs.perf_offset_avg = svs.perf_acc_offset / svs.perf_acc_offset_samples; svs.perf_offset_sdev = sqrt(svs.perf_acc_offset_squared / svs.perf_acc_offset_samples - svs.perf_offset_avg * svs.perf_offset_avg); } - if(svs.perf_lost > 0) + if(svs.perf_lost > 0 && developer_extra.integer) Con_DPrintf("Server can't keep up: %s\n", Host_TimingReport()); svs.perf_acc_realtime = svs.perf_acc_sleeptime = svs.perf_acc_lost = svs.perf_acc_offset = svs.perf_acc_offset_squared = svs.perf_acc_offset_max = svs.perf_acc_offset_samples = 0; } @@ -671,6 +677,7 @@ void Host_Main(void) cl.islocalgame = NetConn_IsLocalGame(); // get new key events + SndSys_SendKeyEvents(); Sys_SendKeyEvents(); NetConn_UpdateSockets(); @@ -693,6 +700,7 @@ void Host_Main(void) if (sv.active ? sv_timer > 0 : cl_timer > 0) { // process console commands + CL_VM_PreventInformationLeaks(); Cbuf_Execute(); } @@ -766,7 +774,10 @@ void Host_Main(void) aborttime = realtime + 0.1; } } - advancetime = min(advancetime, 0.1); + if(slowmo.value > 0 && slowmo.value < 1) + advancetime = min(advancetime, 0.1 / slowmo.value); + else + advancetime = min(advancetime, 0.1); if(advancetime > 0) { @@ -823,11 +834,12 @@ void Host_Main(void) // //------------------- - if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo)) + if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo || ((vid_activewindow ? cl_maxfps : cl_maxidlefps).value < 1))) { // decide the simulation time if (cls.capturevideo.active) { + //*** if (cls.capturevideo.realtime) clframetime = cl.realframetime = max(cl_timer, 1.0 / cls.capturevideo.framerate); else @@ -836,9 +848,15 @@ void Host_Main(void) cl.realframetime = max(cl_timer, clframetime); } } - else if (vid_activewindow && cl_maxfps.value >= 1) + else if (vid_activewindow && cl_maxfps.value >= 1 && !cls.timedemo) + { clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxfps.value); - else if (!vid_activewindow && cl_maxidlefps.value >= 1) + // when running slow, we need to sleep to keep input responsive + wait = bound(0, cl_maxfps_alwayssleep.value * 1000, 100000); + if (wait > 0) + Sys_Sleep((int)wait); + } + else if (!vid_activewindow && cl_maxidlefps.value >= 1 && !cls.timedemo) clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxidlefps.value); else clframetime = cl.realframetime = cl_timer; @@ -870,6 +888,10 @@ void Host_Main(void) cl.oldtime = cl.time; cl.time += clframetime; + // update video + if (host_speeds.integer) + time1 = Sys_DoubleTime(); + // Collect input into cmd CL_Input(); @@ -885,10 +907,6 @@ void Host_Main(void) // update client world (interpolate entities, create trails, etc) CL_UpdateWorld(); - // update video - if (host_speeds.integer) - time1 = Sys_DoubleTime(); - CL_Video_Frame(); CL_Gecko_Frame(); @@ -920,11 +938,15 @@ void Host_Main(void) Con_Printf("%6ius total %6ius server %6ius gfx %6ius snd\n", pass1+pass2+pass3, pass1, pass2, pass3); } - wait = bound(0, host_sleep.value * 1000, 100000); - if (!cls.timedemo && wait >= 1) - Sys_Sleep((int)wait); } +#if MEMPARANOIA + Mem_CheckSentinelsGlobal(); +#else + if (developer_memorydebug.integer) + Mem_CheckSentinelsGlobal(); +#endif + // if there is some time remaining from this frame, reset the timers if (cl_timer >= 0) cl_timer = 0; @@ -957,6 +979,7 @@ char engineversion[128]; qboolean sys_nostdout = false; +extern void u8_Init(void); extern void Render_Init(void); extern void Mathlib_Init(void); extern void FS_Init(void); @@ -986,6 +1009,8 @@ static void Host_Init (void) srand(time(NULL)); // FIXME: this is evil, but possibly temporary + // LordHavoc: doesn't seem very temporary... + // LordHavoc: made this a saved cvar // COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers) if (COM_CheckParm("-developer")) { @@ -995,12 +1020,16 @@ static void Host_Init (void) if (COM_CheckParm("-developer2")) { - developer.value = developer.integer = 100; - developer.string = "100"; - developer_memory.value = developer_memory.integer = 100; - developer.string = "100"; - developer_memorydebug.value = developer_memorydebug.integer = 100; - developer_memorydebug.string = "100"; + developer.value = developer.integer = 1; + developer.string = "1"; + developer_extra.value = developer_extra.integer = 1; + developer_extra.string = "1"; + developer_insane.value = developer_insane.integer = 1; + developer_insane.string = "1"; + developer_memory.value = developer_memory.integer = 1; + developer_memory.string = "1"; + developer_memorydebug.value = developer_memorydebug.integer = 1; + developer_memorydebug.string = "1"; } // COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from @@ -1020,6 +1049,7 @@ static void Host_Init (void) Con_Init(); // initialize various cvars that could not be initialized earlier + u8_Init(); Curl_Init_Commands(); Cmd_Init_Commands(); Sys_Init_Commands(); @@ -1220,6 +1250,7 @@ void Host_Shutdown(void) Sys_Shutdown(); Log_Close(); FS_Shutdown(); + Con_Shutdown(); Memory_Shutdown(); }