changed r_speeds labels again, less csqc monitoring and more consistent

label order from frame to frame

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

diff --git a/cl_parse.c b/cl_parse.c
index 57941d354f8285a350ff8f231d12ffd251800c33..26cbc6fad27c1c8eba06e112bb60214e0bffe90f 100644 (file)
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -3630,7 +3630,7 @@ void CL_ParseServerMessage(void)
 
                        if (cmd == -1)
                        {
-                               R_TimeReport("END OF MESSAGE");
+//                             R_TimeReport("END OF MESSAGE");
                                SHOWNET("END OF MESSAGE");
                                break;          // end of message
                        }
@@ -4075,19 +4075,19 @@ void CL_ParseServerMessage(void)
                                CL_ParsePointParticles1();
                                break;
                        }
-                       R_TimeReport(svc_strings[cmd]);
+//                     R_TimeReport(svc_strings[cmd]);
                }
        }
 
        if (cls.signon == SIGNONS)
                CL_UpdateItemsAndWeapon();
-       R_TimeReport("UpdateItems");
+//     R_TimeReport("UpdateItems");
 
        EntityFrameQuake_ISeeDeadEntities();
-       R_TimeReport("ISeeDeadEntities");
+//     R_TimeReport("ISeeDeadEntities");
 
        CL_UpdateMoveVars();
-       R_TimeReport("UpdateMoveVars");
+//     R_TimeReport("UpdateMoveVars");
 
        parsingerror = false;
 
@@ -4096,7 +4096,7 @@ void CL_ParseServerMessage(void)
        if (cls.demorecording)
        {
                CL_WriteDemoMessage (&net_message);
-               R_TimeReport("WriteDemo");
+//             R_TimeReport("WriteDemo");
        }
 }
 

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 0974a1133879a341c831d2b90c52e161bd9c0765..987236df1d9d1e9506306a6097ebfb5a862cfbb9 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -252,7 +252,7 @@ static void VM_CL_traceline (void)
        int             move, svent;
        prvm_edict_t    *ent;
 
-       R_TimeReport("pretraceline");
+//     R_TimeReport("pretraceline");
 
        VM_SAFEPARMCOUNTRANGE(4, 4, VM_CL_traceline);
 
@@ -269,7 +269,7 @@ static void VM_CL_traceline (void)
        trace = CL_TraceLine(v1, v2, move, ent, CL_GenericHitSuperContentsMask(ent), CL_HitNetworkBrushModels(move), CL_HitNetworkPlayers(move), &svent, true);
 
        CL_VM_SetTraceGlobals(&trace, svent);
-       R_TimeReport("traceline");
+//     R_TimeReport("traceline");
 }
 
 /*
@@ -291,7 +291,7 @@ static void VM_CL_tracebox (void)
        int             move, svent;
        prvm_edict_t    *ent;
 
-       R_TimeReport("pretracebox");
+//     R_TimeReport("pretracebox");
        VM_SAFEPARMCOUNTRANGE(6, 8, VM_CL_tracebox); // allow more parameters for future expansion
 
        prog->xfunction->builtinsprofile += 30;
@@ -309,7 +309,7 @@ static void VM_CL_tracebox (void)
        trace = CL_TraceBox(v1, m1, m2, v2, move, ent, CL_GenericHitSuperContentsMask(ent), CL_HitNetworkBrushModels(move), CL_HitNetworkPlayers(move), &svent, true);
 
        CL_VM_SetTraceGlobals(&trace, svent);
-       R_TimeReport("tracebox");
+//     R_TimeReport("tracebox");
 }
 
 trace_t CL_Trace_Toss (prvm_edict_t *tossent, prvm_edict_t *ignore, int *svent)

diff --git a/gl_rmain.c b/gl_rmain.c
index b1df2d9d673f214d59f81aa3d8a91426d68865a9..e91a8d1961d2b9008f36e12ec56eaff5e79e7f13 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -8340,6 +8340,9 @@ void R_RenderScene(void)
 {
        qboolean shadowmapping = false;
 
+       if (r_timereport_active)
+               R_TimeReport("beginscene");
+
        r_refdef.stats.renders++;
 
        R_UpdateFogColor();
@@ -8354,6 +8357,9 @@ void R_RenderScene(void)
 
        Matrix4x4_CreateTranslate(&r_waterscrollmatrix, sin(r_refdef.scene.time) * 0.025 * r_waterscroll.value, sin(r_refdef.scene.time * 0.8f) * 0.025 * r_waterscroll.value, 0);
 
+       if (r_timereport_active)
+               R_TimeReport("skystartframe");
+
        if (cl.csqc_vidvars.drawworld)
        {
                // don't let sound skip if going slow

diff --git a/host.c b/host.c
index c8a5c8ed301b12f747a3221a5b5db24124c35d9c..f90173f3413e332f615abb4f8cbd4babf4753743 100644 (file)
--- a/host.c
+++ b/host.c
@@ -700,10 +700,10 @@ void Host_Main(void)
                if (sv.active ? sv_timer > 0 : cl_timer > 0)
                {
                        // process console commands
-                       R_TimeReport("preconsole");
+//                     R_TimeReport("preconsole");
                        CL_VM_PreventInformationLeaks();
                        Cbuf_Execute();
-                       R_TimeReport("console");
+//                     R_TimeReport("console");
                }
 
                //Con_Printf("%6.0f %6.0f\n", cl_timer * 1000000.0, sv_timer * 1000000.0);
@@ -725,10 +725,12 @@ void Host_Main(void)
                        else
                                Sys_Sleep((int)wait);
                        svs.perf_acc_sleeptime += Sys_DoubleTime() - time0;
-                       R_TimeReport("sleep");
+//                     R_TimeReport("sleep");
                        continue;
                }
 
+               R_TimeReport("---");
+
        //-------------------
        //
        // server operations
@@ -832,6 +834,12 @@ void Host_Main(void)
                        NetConn_Heartbeat(0);
                        R_TimeReport("servernetwork");
                }
+               else
+               {
+                       // don't let r_speeds display jump around
+                       R_TimeReport("serverphysics");
+                       R_TimeReport("servernetwork");
+               }
 
        //-------------------
        //
@@ -925,6 +933,7 @@ void Host_Main(void)
                        R_TimeReport("client");
 
                        CL_UpdateScreen();
+                       R_TimeReport("render");
 
                        if (host_speeds.integer)
                                time2 = Sys_DoubleTime();

diff --git a/netconn.c b/netconn.c
index 075ecd8d3ffe188206b40d16c7129e3e53a1385f..2700ee4ae894ff58489539319e6946f825fba0d1 100755 (executable)
--- a/netconn.c
+++ b/netconn.c
@@ -2128,9 +2128,9 @@ void NetConn_ClientFrame(void)
        {
                while (cl_sockets[i] && (length = NetConn_Read(cl_sockets[i], readbuffer, sizeof(readbuffer), &peeraddress)) > 0)
                {
-                       R_TimeReport("clientreadnetwork");
+//                     R_TimeReport("clientreadnetwork");
                        NetConn_ClientParsePacket(cl_sockets[i], readbuffer, length, &peeraddress);
-                       R_TimeReport("clientparsepacket");
+//                     R_TimeReport("clientparsepacket");
                }
        }
        NetConn_QueryQueueFrame();

diff --git a/snd_main.c b/snd_main.c
index a73a5181da260d8e294fab751dc6a94a6144f047..2d456a4abfd881ed22f0df86595df9e073af7002 100644 (file)
--- a/snd_main.c
+++ b/snd_main.c
@@ -1894,6 +1894,7 @@ static void S_PaintAndSubmit (void)
        oldsoundtime = soundtime;
 
        cls.soundstats.latency_milliseconds = (snd_renderbuffer->endframe - snd_renderbuffer->startframe) * 1000 / snd_renderbuffer->format.speed;
+       R_TimeReport("audiomix");
 }
 
 /*
@@ -1980,6 +1981,7 @@ void S_Update(const matrix4x4_t *listenermatrix)
        S_UpdateAmbientSounds ();
 
        combine = NULL;
+       R_TimeReport("audioprep");
 
        // update spatialization for static and dynamic sounds
        cls.soundstats.totalsounds = 0;
@@ -2033,6 +2035,7 @@ void S_Update(const matrix4x4_t *listenermatrix)
                if (k < SND_LISTENERS)
                        cls.soundstats.mixedsounds++;
        }
+       R_TimeReport("audiospatialize");
 
        sound_spatialized = true;
 

diff --git a/snd_win.c b/snd_win.c
index 92ff70dd564972d4d5f83945322107c4d8fb260a..a7a2adff12571818a8f74629f8e821498585c7bf 100644 (file)
--- a/snd_win.c
+++ b/snd_win.c
@@ -769,7 +769,7 @@ unsigned int SndSys_GetSoundTime (void)
                {
                        if (snd_completed == snd_sent)
                        {
-                               Con_DPrint("Sound overrun\n");
+                       //      Con_DPrint("Sound overrun\n");
                                break;
                        }