X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=host.c;h=6d1788a9d9d56ad82ff6df6be16df5282dcc8194;hb=9cce5b7eefa8ec89bda698afc50759914f6347ea;hp=e0883aeb5716e1be59056d202cd2b120f56a79de;hpb=bd4bd21012fc5f0b87abcdb58f66b966f27cbcc9;p=xonotic%2Fdarkplaces.git diff --git a/host.c b/host.c index e0883aeb..6d1788a9 100644 --- a/host.c +++ b/host.c @@ -21,6 +21,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include "quakedef.h" +#include "libcurl.h" #include "cdaudio.h" #include "cl_video.h" #include "progsvm.h" @@ -51,8 +52,11 @@ client_t *host_client; jmp_buf host_abortframe; +// random seed +cvar_t sv_random_seed = {0, "sv_random_seed", "", "random seed; when set, on every map start this random seed is used to initialize the random number generator. Don't touch it unless for benchmarking or debugging"}; + // pretend frames take this amount of time (in seconds), 0 = realtime -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 host_maxfps if you want to limit your framerate instead, or sys_ticrate to limit server speed"}; +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"}; // LordHavoc: framerate independent slowmo @@ -85,7 +89,9 @@ cvar_t pausable = {0, "pausable","1", "allow players to pause or not"}; cvar_t temp1 = {0, "temp1","0", "general cvar for mods to use, in stock id1 this selects which death animation to use on players (0 = random death, other values select specific death scenes)"}; cvar_t timestamps = {CVAR_SAVE, "timestamps", "0", "prints timestamps on console messages"}; -cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%b %e %X] ", "time format to use on timestamped console messages"}; +cvar_t timeformat = {CVAR_SAVE, "timeformat", "[%Y-%m-%d %H:%M:%S] ", "time format to use on timestamped console messages"}; + +cvar_t sv_checkforpacketsduringsleep = {0, "sv_checkforpacketsduringsleep", "0", "uses select() function to wait between frames which can be interrupted by packets being received, instead of Sleep()/usleep()/SDL_Sleep() functions which do not check for packets"}; /* ================ @@ -131,7 +137,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; - strcpy(hosterrorstring2, hosterrorstring1); + strlcpy(hosterrorstring2, hosterrorstring1, sizeof(hosterrorstring2)); CL_Parse_DumpPacket(); @@ -212,10 +218,13 @@ Host_InitLocal ====================== */ void Host_SaveConfig_f(void); +void Host_LoadConfig_f(void); static void Host_InitLocal (void) { Cmd_AddCommand("saveconfig", Host_SaveConfig_f, "save settings to config.cfg immediately (also automatic when quitting)"); + Cmd_AddCommand("loadconfig", Host_LoadConfig_f, "reset everything and reload configs"); + Cvar_RegisterVariable (&sv_random_seed); Cvar_RegisterVariable (&host_framerate); Cvar_RegisterVariable (&host_speeds); Cvar_RegisterVariable (&slowmo); @@ -243,6 +252,8 @@ static void Host_InitLocal (void) Cvar_RegisterVariable (×tamps); Cvar_RegisterVariable (&timeformat); + + Cvar_RegisterVariable (&sv_checkforpacketsduringsleep); } @@ -260,7 +271,7 @@ void Host_SaveConfig_f(void) // dedicated servers initialize the host but don't parse and set the // config.cfg cvars // LordHavoc: don't save a config if it crashed in startup - if (host_framecount >= 3 && cls.state != ca_dedicated) + if (host_framecount >= 3 && cls.state != ca_dedicated && !COM_CheckParm("-benchmark")) { f = FS_Open ("config.cfg", "wb", false, false); if (!f) @@ -277,6 +288,21 @@ void Host_SaveConfig_f(void) } +/* +=============== +Host_LoadConfig_f + +Resets key bindings and cvars to defaults and then reloads scripts +=============== +*/ +void Host_LoadConfig_f(void) +{ + // unlock the cvar default strings so they can be updated by the new default.cfg + Cvar_UnlockDefaults(); + // reset cvars to their defaults, and then exec startup scripts again + Cbuf_InsertText("cvar_resettodefaults_all;exec quake.rc\n"); +} + /* ================= SV_ClientPrint @@ -328,7 +354,7 @@ void SV_BroadcastPrint(const char *msg) for (i = 0, client = svs.clients;i < svs.maxclients;i++, client++) { - if (client->spawned && client->netconnection) + if (client->active && client->netconnection) { MSG_WriteByte(&client->netconnection->message, svc_print); MSG_WriteString(&client->netconnection->message, msg); @@ -409,9 +435,9 @@ void SV_DropClient(qboolean crash) buf.data = bufdata; buf.maxsize = sizeof(bufdata); MSG_WriteByte(&buf, svc_disconnect); - NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol); - NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol); - NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol); + NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000); + NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000); + NetConn_SendUnreliableMessage(host_client->netconnection, &buf, sv.protocol, 10000); } // break the net connection NetConn_Close(host_client->netconnection); @@ -432,11 +458,18 @@ void SV_DropClient(qboolean crash) prog->globals.server->self = saveSelf; } + // if a download is active, close it + if (host_client->download_file) + { + Con_DPrintf("Download of %s aborted when %s dropped\n", host_client->download_name, host_client->name); + FS_Close(host_client->download_file); + host_client->download_file = NULL; + host_client->download_name[0] = 0; + host_client->download_expectedposition = 0; + host_client->download_started = false; + } + // remove leaving player from scoreboard - //host_client->edict->fields.server->netname = PRVM_SetEngineString(host_client->name); - //if ((val = PRVM_GETEDICTFIELDVALUE(host_client->edict, eval_clientcolors))) - // val->_float = 0; - //host_client->edict->fields.server->frags = 0; host_client->name[0] = 0; host_client->colors = 0; host_client->frags = 0; @@ -544,37 +577,31 @@ Runs all active servers static void Host_Init(void); void Host_Main(void) { - static double time1 = 0; - static double time2 = 0; - static double time3 = 0; - // these are static because of setjmp/longjmp warnings in mingw32 gcc 2.95.3 - static double frameoldtime, framenewtime, frametime, cl_timer, sv_timer; + double time1 = 0; + double time2 = 0; + double time3 = 0; + double cl_timer, sv_timer; + double clframetime, deltarealtime, oldrealtime; + double wait; + int pass1, pass2, pass3; Host_Init(); cl_timer = 0; sv_timer = 0; - framenewtime = Sys_DoubleTime(); + realtime = Sys_DoubleTime(); for (;;) { if (setjmp(host_abortframe)) continue; // something bad happened, or the server disconnected - frameoldtime = framenewtime; - framenewtime = Sys_DoubleTime(); - frametime = framenewtime - frameoldtime; - realtime += frametime; - - // if there is some time remaining from last frame, rest the timers - if (cl_timer >= 0) - cl_timer = 0; - if (sv_timer >= 0) - sv_timer = 0; + oldrealtime = realtime; + realtime = Sys_DoubleTime(); - // accumulate the new frametime into the timers - cl_timer += frametime; - sv_timer += frametime; + deltarealtime = realtime - oldrealtime; + cl_timer += deltarealtime; + sv_timer += deltarealtime; if (slowmo.value < 0) Cvar_SetValue("slowmo", 0); @@ -583,31 +610,27 @@ void Host_Main(void) if (cl_maxfps.value < 1) Cvar_SetValue("cl_maxfps", 1); - // if the accumulators haven't become positive yet, keep waiting - if (!cls.timedemo && cl_timer <= 0 && sv_timer <= 0) - { - double wait; - int msleft; - if (cls.state == ca_dedicated) - wait = sv_timer; - else if (!sv.active) - wait = cl_timer; - else - wait = max(cl_timer, sv_timer); - msleft = (int)floor(wait * -1000.0); - if (msleft >= 1) - Sys_Sleep(msleft); - continue; - } - - // keep the random time dependent - rand(); + // keep the random time dependent, but not when playing demos/benchmarking + if(!*sv_random_seed.string && !cls.demoplayback) + rand(); cl.islocalgame = NetConn_IsLocalGame(); // get new key events Sys_SendKeyEvents(); + NetConn_UpdateSockets(); + + // receive packets on each main loop iteration, as the main loop may + // be undersleeping due to select() detecting a new packet + if (sv.active) + NetConn_ServerFrame(); + + Curl_Run(); + + // check for commands typed to the host + Host_GetConsoleCommands(); + // when a server is running we only execute console commands on server frames // (this mainly allows frikbot .way config files to work properly by staying in sync with the server qc) // otherwise we execute them on all frames @@ -617,7 +640,31 @@ void Host_Main(void) Cbuf_Execute(); } - NetConn_UpdateSockets(); + //Con_Printf("%6.0f %6.0f\n", cl_timer * 1000000.0, sv_timer * 1000000.0); + + // if the accumulators haven't become positive yet, wait a while + if (cls.state == ca_dedicated) + wait = sv_timer * -1000000.0; + else if (!sv.active) + wait = cl_timer * -1000000.0; + else + wait = max(cl_timer, sv_timer) * -1000000.0; + if (wait > 100000) + wait = 100000; + if (!cls.timedemo && wait > 0) + { + if (sv_checkforpacketsduringsleep.integer) + { + if (wait >= 1) + NetConn_SleepMicroseconds((int)wait); + } + else + { + if (wait >= 1000) + Sys_Sleep((int)wait / 1000); + } + continue; + } //------------------- // @@ -625,84 +672,78 @@ void Host_Main(void) // //------------------- - if (sv_timer > 0) + // limit the frametime steps to no more than 100ms each + if (cl_timer > 0.1) + cl_timer = 0.1; + if (sv_timer > 0.1) + sv_timer = 0.1; + + if (sv.active && sv_timer > 0) { - if (!sv.active) + // execute one or more server frames, with an upper limit on how much + // execution time to spend on server frames to avoid freezing the game if + // the server is overloaded, this execution time limit means the game will + // slow down if the server is taking too long. + int framecount, framelimit = 1; + double advancetime, aborttime = 0; + + // run the world state + // don't allow simulation to run too fast or too slow or logic glitches can occur + + // stop running server frames if the wall time reaches this value + if (sys_ticrate.value <= 0) + advancetime = sv_timer; + else if (cl.islocalgame && !sv_fixedframeratesingleplayer.integer) { - // if there is no server, run server timing at 10fps - sv_timer -= 0.1; + // synchronize to the client frametime, but no less than 10ms and no more than sys_ticrate + advancetime = bound(0.01, cl_timer, sys_ticrate.value); + framelimit = 10; + aborttime = realtime + 0.1; } else { - // execute one or more server frames, with an upper limit on how much - // execution time to spend on server frames to avoid freezing the game if - // the server is overloaded, this execution time limit means the game will - // slow down if the server is taking too long. - int framecount, framelimit = 1; - double advancetime, aborttime = 0; - - // receive server packets now, which might contain rcon commands, which - // may change level or other such things we don't want to have happen in - // the middle of Host_Frame - NetConn_ServerFrame(); - - // check for commands typed to the host - Host_GetConsoleCommands(); - - // run the world state - // don't allow simulation to run too fast or too slow or logic glitches can occur - - // stop running server frames if the wall time reaches this value - if (sys_ticrate.value <= 0 || (cl.islocalgame && !sv_fixedframeratesingleplayer.integer)) - advancetime = sv_timer; - else + advancetime = sys_ticrate.value; + // listen servers can run multiple server frames per client frame + if (cls.state == ca_connected) { - advancetime = sys_ticrate.value; - // listen servers can run multiple server frames per client frame - if (cls.state == ca_connected) - { - framelimit = 10; - aborttime = Sys_DoubleTime() + 0.1; - } + framelimit = 10; + aborttime = realtime + 0.1; } - advancetime = min(advancetime, 0.1); + } + advancetime = min(advancetime, 0.1); - // only advance time if not paused - // the game also pauses in singleplayer when menu or console is used - sv.frametime = advancetime * slowmo.value; - if (host_framerate.value) - sv.frametime = host_framerate.value; - if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive))) - sv.frametime = 0; + // only advance time if not paused + // the game also pauses in singleplayer when menu or console is used + sv.frametime = advancetime * slowmo.value; + if (host_framerate.value) + sv.frametime = host_framerate.value; + if (sv.paused || (cl.islocalgame && (key_dest != key_game || key_consoleactive))) + sv.frametime = 0; - // setup the VM frame - SV_VM_Begin(); + // setup the VM frame + SV_VM_Begin(); - for (framecount = 0;framecount < framelimit && sv_timer > 0;framecount++) - { - sv_timer -= advancetime; - - // move things around and think unless paused - if (sv.frametime) - SV_Physics(); + for (framecount = 0;framecount < framelimit && sv_timer > 0;framecount++) + { + sv_timer -= advancetime; - // send all messages to the clients - SV_SendClientMessages(); + // move things around and think unless paused + if (sv.frametime) + SV_Physics(); - // clear the general datagram - SV_ClearDatagram(); + // send all messages to the clients + SV_SendClientMessages(); - // if this server frame took too long, break out of the loop - if (framelimit > 1 && Sys_DoubleTime() >= aborttime) - break; - } + // if this server frame took too long, break out of the loop + if (framelimit > 1 && Sys_DoubleTime() >= aborttime) + break; + } - // end the server VM frame - SV_VM_End(); + // end the server VM frame + SV_VM_End(); - // send an heartbeat if enough time has passed since the last one - NetConn_Heartbeat(0); - } + // send an heartbeat if enough time has passed since the last one + NetConn_Heartbeat(0); } //------------------- @@ -711,89 +752,80 @@ void Host_Main(void) // //------------------- - if (cl_timer > 0 || cls.timedemo) + if (cls.state != ca_dedicated && (cl_timer > 0 || cls.timedemo)) { - if (cls.state == ca_dedicated) + // decide the simulation time + if (cls.capturevideo.active) { - // if there is no client, run client timing at 10fps - cl_timer -= 0.1; - if (host_speeds.integer) - time1 = time2 = Sys_DoubleTime(); + if (cls.capturevideo.realtime) + clframetime = cl.realframetime = max(cl_timer, 1.0 / cls.capturevideo.framerate); + else + { + clframetime = 1.0 / cls.capturevideo.framerate; + cl.realframetime = max(cl_timer, clframetime); + } } + else if (vid_activewindow) + clframetime = cl.realframetime = max(cl_timer, 1.0 / cl_maxfps.value); else - { - double frametime; - frametime = cl.realframetime = min(cl_timer, 1); + clframetime = cl.realframetime = 0.1; - // decide the simulation time - if (!cls.timedemo) - { - if (cls.capturevideo_active && !cls.capturevideo_soundfile) - { - frametime = 1.0 / cls.capturevideo_framerate; - cl.realframetime = max(cl.realframetime, frametime); - } - else if (vid_activewindow) - frametime = cl.realframetime = max(cl.realframetime, 1.0 / cl_maxfps.value); - else - frametime = cl.realframetime = 0.1; - - // deduct the frame time from the accumulator - cl_timer -= cl.realframetime; - - // apply slowmo scaling - frametime *= slowmo.value; - - // host_framerate overrides all else - if (host_framerate.value) - frametime = host_framerate.value; - } + // apply slowmo scaling + clframetime *= slowmo.value; - cl.oldtime = cl.time; - cl.time += frametime; + // host_framerate overrides all else + if (host_framerate.value) + clframetime = host_framerate.value; - // Collect input into cmd - CL_Move(); + if (cls.timedemo) + clframetime = cl.realframetime = cl_timer; - NetConn_ClientFrame(); + // deduct the frame time from the accumulator + cl_timer -= cl.realframetime; - if (cls.state == ca_connected) - { - CL_ReadFromServer(); - // if running the server remotely, send intentions now after - // the incoming messages have been read - //if (!cl.islocalgame) - // CL_SendCmd(); - } + cl.oldtime = cl.time; + cl.time += clframetime; - // update video - if (host_speeds.integer) - time1 = Sys_DoubleTime(); + // Collect input into cmd + CL_Input(); - //ui_update(); + NetConn_ClientFrame(); - CL_VideoFrame(); + if (cls.state == ca_connected) + { + CL_ReadFromServer(); + // if running the server remotely, send intentions now after + // the incoming messages have been read + //if (!cl.islocalgame) + // CL_SendCmd(); + } - CL_UpdateScreen(); + // update video + if (host_speeds.integer) + time1 = Sys_DoubleTime(); - if (host_speeds.integer) - time2 = Sys_DoubleTime(); + //ui_update(); - // update audio - if(csqc_usecsqclistener) - { - S_Update(&csqc_listenermatrix); - csqc_usecsqclistener = false; - } - else - S_Update(&r_refdef.viewentitymatrix); + CL_VideoFrame(); - CDAudio_Update(); + CL_UpdateScreen(); + + if (host_speeds.integer) + time2 = Sys_DoubleTime(); + + // update audio + if(csqc_usecsqclistener) + { + S_Update(&csqc_listenermatrix); + csqc_usecsqclistener = false; } + else + S_Update(&r_view.matrix); + + CDAudio_Update(); if (host_speeds.integer) { - int pass1, pass2, pass3; pass1 = (int)((time1 - time3)*1000000); time3 = Sys_DoubleTime(); pass2 = (int)((time2 - time1)*1000000); @@ -803,6 +835,12 @@ void Host_Main(void) } } + // if there is some time remaining from this frame, reset the timers + if (cl_timer >= 0) + cl_timer = 0; + if (sv_timer >= 0) + sv_timer = 0; + host_framecount++; } } @@ -831,7 +869,6 @@ extern void FS_Shutdown(void); extern void PR_Cmd_Init(void); extern void COM_Init_Commands(void); extern void FS_Init_Commands(void); -extern void COM_CheckRegistered(void); extern qboolean host_stuffcmdsrun; /* @@ -844,6 +881,12 @@ static void Host_Init (void) int i; const char* os; + // LordHavoc: quake never seeded the random number generator before... heh + if (COM_CheckParm("-benchmark")) + srand(0); // predictable random sequence for -benchmark + else + srand(time(NULL)); + // FIXME: this is evil, but possibly temporary // COMMANDLINEOPTION: Console: -developer enables warnings and other notices (RECOMMENDED for mod developers) if (COM_CheckParm("-developer")) @@ -862,20 +905,28 @@ static void Host_Init (void) developer_memorydebug.string = "100"; } - // LordHavoc: quake never seeded the random number generator before... heh - srand(time(NULL)); +// COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from + if (COM_CheckParm("-nostdout")) + sys_nostdout = 1; // used by everything Memory_Init(); - // initialize console and logging - Con_Init(); - // initialize console command/cvar/alias/command execution systems Cmd_Init(); - // parse commandline - COM_InitArgv(); + // initialize memory subsystem cvars/commands + Memory_Init_Commands(); + + // initialize console and logging and its cvars/commands + Con_Init(); + + // initialize various cvars that could not be initialized earlier + Curl_Init_Commands(); + Cmd_Init_Commands(); + Sys_Init_Commands(); + COM_Init_Commands(); + FS_Init_Commands(); // initialize console window (only used by sys_win.c) Sys_InitConsole(); @@ -902,33 +953,21 @@ static void Host_Init (void) os = "Unknown"; #endif dpsnprintf (engineversion, sizeof (engineversion), "%s %s %s", gamename, os, buildstring); - -// COMMANDLINEOPTION: Console: -nostdout disables text output to the terminal the game was launched from - if (COM_CheckParm("-nostdout")) - sys_nostdout = 1; - else - Con_Printf("%s\n", engineversion); - - // initialize filesystem (including fs_basedir, fs_gamedir, -path, -game, scr_screenshot_name) - FS_Init(); - - // initialize various cvars that could not be initialized earlier - Memory_Init_Commands(); - Con_Init_Commands(); - Cmd_Init_Commands(); - Sys_Init_Commands(); - COM_Init_Commands(); - FS_Init_Commands(); - COM_CheckRegistered(); + Con_Printf("%s\n", engineversion); // initialize ixtable Mathlib_Init(); + // initialize filesystem (including fs_basedir, fs_gamedir, -game, scr_screenshot_name) + FS_Init(); + NetConn_Init(); + Curl_Init(); //PR_Init(); //PR_Cmd_Init(); PRVM_Init(); Mod_Init(); + World_Init(); SV_Init(); Host_InitCommands(); Host_InitLocal(); @@ -1006,16 +1045,6 @@ static void Host_Init (void) Cbuf_Execute(); } - // check for special demolooponly mode -// COMMANDLINEOPTION: Client: -demolooponly runs a playdemo and quits - i = COM_CheckParm("-demolooponly"); - if (i && i + 1 < com_argc) - if (!sv.active && !cls.demoplayback && !cls.connect_trying) - { - Cbuf_AddText(va("playdemo %s\n", com_argv[i + 1])); - Cbuf_Execute(); - } - if (cls.state == ca_dedicated || COM_CheckParm("-listen")) if (!sv.active && !cls.demoplayback && !cls.connect_trying) { @@ -1079,6 +1108,7 @@ void Host_Shutdown(void) CDAudio_Shutdown (); S_Terminate (); + Curl_Shutdown (); NetConn_Shutdown (); //PR_Shutdown ();