Measure some timing values for output in status; also, if developer is 1, complain...

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@7449 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/host.c b/host.c
index fa64cf64e16bb35ec03d5bd21e8afe6382706188..bba739c7070bf0c23603274594a057aa8deabf50 100644 (file)
--- a/host.c
+++ b/host.c
@@ -518,6 +518,18 @@ void Host_GetConsoleCommands (void)
        }
 }
 
+/*
+==================
+Host_TimeReport
+
+Returns a time report string, for example for 
+==================
+*/
+const char *Host_TimingReport()
+{
+       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);
+}
+
 /*
 ==================
 Host_Frame
@@ -534,7 +546,7 @@ void Host_Main(void)
        double cl_timer, sv_timer;
        double clframetime, deltarealtime, oldrealtime;
        double wait;
-       int pass1, pass2, pass3;
+       int pass1, pass2, pass3, i;
 
        Host_Init();
 
@@ -554,6 +566,34 @@ void Host_Main(void)
                cl_timer += deltarealtime;
                sv_timer += deltarealtime;
 
+               svs.perf_acc_realtime += deltarealtime;
+
+               // Look for clients who have spawned
+               for (i = 0, host_client = svs.clients;i < svs.maxclients;i++, host_client++)
+                       if(host_client->spawned)
+                               if(host_client->netconnection)
+                                       break;
+               if(i == svs.maxclients)
+               {
+                       // Nobody is looking? Then we won't do timing...
+                       // Instead, reset it to zero
+                       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;
+               }
+               else if(svs.perf_acc_realtime > 5)
+               {
+                       svs.perf_cpuload = 1 - svs.perf_acc_sleeptime / svs.perf_acc_realtime;
+                       svs.perf_lost = svs.perf_acc_lost / svs.perf_acc_realtime;
+                       if(svs.perf_acc_offset_samples > 0)
+                       {
+                               svs.perf_offset_max = svs.perf_acc_offset_max;
+                               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)
+                               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;
+               }
+
                if (slowmo.value < 0)
                        Cvar_SetValue("slowmo", 0);
                if (host_framerate.value < 0.00001 && host_framerate.value != 0)
@@ -602,8 +642,10 @@ void Host_Main(void)
                        wait = max(cl_timer, sv_timer) * -1000000.0;
                if (wait > 100000)
                        wait = 100000;
+
                if (!cls.timedemo && wait > 0)
                {
+                       double time0 = Sys_DoubleTime();
                        if (sv_checkforpacketsduringsleep.integer)
                        {
                                if (wait >= 1)
@@ -614,6 +656,7 @@ void Host_Main(void)
                                if (wait >= 1000)
                                        Sys_Sleep((int)wait / 1000);
                        }
+                       svs.perf_acc_sleeptime += Sys_DoubleTime() - time0;
                        continue;
                }
 
@@ -627,7 +670,10 @@ void Host_Main(void)
                if (cl_timer > 0.1)
                        cl_timer = 0.1;
                if (sv_timer > 0.1)
+               {
+                       svs.perf_acc_lost += (sv_timer - 0.1);
                        sv_timer = 0.1;
+               }
 
                if (sv.active && sv_timer > 0)
                {
@@ -637,6 +683,7 @@ void Host_Main(void)
                        // slow down if the server is taking too long.
                        int framecount, framelimit = 1;
                        double advancetime, aborttime = 0;
+                       float offset;
 
                        // run the world state
                        // don't allow simulation to run too fast or too slow or logic glitches can occur
@@ -663,6 +710,16 @@ void Host_Main(void)
                        }
                        advancetime = min(advancetime, 0.1);
 
+                       if(advancetime > 0)
+                       {
+                               offset = sv_timer;
+                               ++svs.perf_acc_offset_samples;
+                               svs.perf_acc_offset += offset;
+                               svs.perf_acc_offset_squared += offset * offset;
+                               if(svs.perf_acc_offset_max < offset)
+                                       svs.perf_acc_offset_max = offset;
+                       }
+
                        // only advance time if not paused
                        // the game also pauses in singleplayer when menu or console is used
                        sv.frametime = advancetime * slowmo.value;
@@ -799,7 +856,10 @@ void Host_Main(void)
                if (cl_timer >= 0)
                        cl_timer = 0;
                if (sv_timer >= 0)
+               {
+                       svs.perf_acc_lost += sv_timer;
                        sv_timer = 0;
+               }
 
                host_framecount++;
        }

diff --git a/host_cmd.c b/host_cmd.c
index ee5fdcdf0240b9a002130291732e1bcf282f551e..73a34bb1437fa89f962a00c6cedcbc82c77c89cc 100644 (file)
--- a/host_cmd.c
+++ b/host_cmd.c
@@ -46,7 +46,6 @@ void Host_Quit_f (void)
                Sys_Quit (0);
 }
 
-
 /*
 ==================
 Host_Status_f
@@ -81,6 +80,7 @@ void Host_Status_f (void)
        print ("version:  %s build %s\n", gamename, buildstring);
        print ("protocol: %i (%s)\n", Protocol_NumberForEnum(sv.protocol), Protocol_NameForEnum(sv.protocol));
        print ("map:      %s\n", sv.name);
+       print ("timing:   %s\n", Host_TimingReport());
        print ("players:  %i active (%i max)\n\n", players, svs.maxclients);
        for (j = 0, client = svs.clients;j < svs.maxclients;j++, client++)
        {

diff --git a/server.h b/server.h
index 07a3eb7012ccd16f603e3d765aa3ba6ca09d292c..840838affbf8797ab824c8300ced697c84cd42af 100644 (file)
--- a/server.h
+++ b/server.h
@@ -34,6 +34,20 @@ typedef struct server_static_s
        qboolean changelevel_issued;
        // server infostring
        char serverinfo[MAX_SERVERINFO_STRING];
+       // performance data
+       float perf_cpuload;
+       float perf_lost;
+       float perf_offset_avg;
+       float perf_offset_max;
+       float perf_offset_sdev;
+       // temporary performance data accumulators
+       float perf_acc_realtime;
+       float perf_acc_sleeptime;
+       float perf_acc_lost;
+       float perf_acc_offset;
+       float perf_acc_offset_squared;
+       float perf_acc_offset_max;
+       int perf_acc_offset_samples;
 } server_static_t;
 
 //=============================================================================
@@ -460,5 +474,7 @@ void SV_SetupVM(void);
 void SV_VM_Begin(void);
 void SV_VM_End(void);
 
+const char *Host_TimingReport(); // for output in Host_Status_f
+
 #endif