#include "quakedef.h"
-void CL_FinishTimeDemo (void);
+#ifdef CONFIG_VIDEO_CAPTURE
+extern cvar_t cl_capturevideo;
+extern cvar_t cl_capturevideo_demo_stop;
+#endif
+int old_vsync = 0;
+
+static void CL_FinishTimeDemo (void);
/*
==============================================================================
*/
void CL_NextDemo (void)
{
- char str[1024];
+ char str[MAX_INPUTLINE];
if (cls.demonum == -1)
return; // don't play demos
}
}
- sprintf (str,"playdemo %s\n", cls.demos[cls.demonum]);
+ dpsnprintf (str, sizeof(str), "playdemo %s\n", cls.demos[cls.demonum]);
Cbuf_InsertText (str);
cls.demonum++;
}
// LordHavoc: now called only by CL_Disconnect
void CL_StopPlayback (void)
{
+#ifdef CONFIG_VIDEO_CAPTURE
+ if (cl_capturevideo_demo_stop.integer)
+ Cvar_Set("cl_capturevideo", "0");
+#endif
+
if (!cls.demoplayback)
return;
if (cls.timedemo)
CL_FinishTimeDemo ();
+
+ if (!cls.demostarting) // only quit if not starting another demo
+ if (COM_CheckParm("-demo") || COM_CheckParm("-capturedemo"))
+ Host_Quit_f();
+
}
/*
CL_WriteDemoMessage
Dumps the current net message, prefixed by the length and view angles
-====================
+#====================
*/
-void CL_WriteDemoMessage (void)
+void CL_WriteDemoMessage (sizebuf_t *message)
{
int len;
int i;
if (cls.demopaused) // LordHavoc: pausedemo
return;
- len = LittleLong (net_message.cursize);
+ len = LittleLong (message->cursize);
FS_Write (cls.demofile, &len, 4);
for (i=0 ; i<3 ; i++)
{
f = LittleFloat (cl.viewangles[i]);
FS_Write (cls.demofile, &f, 4);
}
- FS_Write (cls.demofile, net_message.data, net_message.cursize);
- FS_Flush (cls.demofile);
+ FS_Write (cls.demofile, message->data, message->cursize);
+}
+
+/*
+====================
+CL_CutDemo
+
+Dumps the current demo to a buffer, and resets the demo to its starting point.
+Used to insert csprogs.dat files as a download to the beginning of a demo file.
+====================
+*/
+void CL_CutDemo (unsigned char **buf, fs_offset_t *filesize)
+{
+ *buf = NULL;
+ *filesize = 0;
+
+ FS_Close(cls.demofile);
+ *buf = FS_LoadFile(cls.demoname, tempmempool, false, filesize);
+
+ // restart the demo recording
+ cls.demofile = FS_OpenRealFile(cls.demoname, "wb", false);
+ if(!cls.demofile)
+ Sys_Error("failed to reopen the demo file");
+ FS_Printf(cls.demofile, "%i\n", cls.forcetrack);
+}
+
+/*
+====================
+CL_PasteDemo
+
+Adds the cut stuff back to the demo. Also frees the buffer.
+Used to insert csprogs.dat files as a download to the beginning of a demo file.
+====================
+*/
+void CL_PasteDemo (unsigned char **buf, fs_offset_t *filesize)
+{
+ fs_offset_t startoffset = 0;
+
+ if(!*buf)
+ return;
+
+ // skip cdtrack
+ while(startoffset < *filesize && ((char *)(*buf))[startoffset] != '\n')
+ ++startoffset;
+ if(startoffset < *filesize)
+ ++startoffset;
+
+ FS_Write(cls.demofile, *buf + startoffset, *filesize - startoffset);
+
+ Mem_Free(*buf);
+ *buf = NULL;
+ *filesize = 0;
}
/*
*/
void CL_ReadDemoMessage(void)
{
- int r, i;
+ int i;
float f;
if (!cls.demoplayback)
if (cls.demopaused)
return;
- while (1)
+ for (;;)
{
// decide if it is time to grab the next message
// always grab until fully connected
{
if (cls.timedemo)
{
- if (host_framecount == cls.td_lastframe)
- {
- // already read this frame's message
- return;
- }
- if (cls.td_lastframe == -1)
- {
- // we start counting on the second frame
- // (after parsing connection stuff)
- cls.td_startframe = host_framecount + 1;
- }
- cls.td_lastframe = host_framecount;
+ cls.td_frames++;
+ cls.td_onesecondframes++;
// if this is the first official frame we can now grab the real
// td_starttime so the bogus time on the first frame doesn't
// count against the final report
- if (host_framecount == cls.td_startframe)
+ if (cls.td_frames == 0)
+ {
cls.td_starttime = realtime;
- if (host_framecount > cls.td_startframe + 2)
+ cls.td_onesecondnexttime = cl.time + 1;
+ cls.td_onesecondrealtime = realtime;
+ cls.td_onesecondframes = 0;
+ cls.td_onesecondminfps = 0;
+ cls.td_onesecondmaxfps = 0;
+ cls.td_onesecondavgfps = 0;
+ cls.td_onesecondavgcount = 0;
+ }
+ if (cl.time >= cls.td_onesecondnexttime)
{
- cls.td_minframetime = min(cls.td_minframetime, host_realframetime);
- cls.td_maxframetime = max(cls.td_maxframetime, host_realframetime);
+ double fps = cls.td_onesecondframes / (realtime - cls.td_onesecondrealtime);
+ if (cls.td_onesecondavgcount == 0)
+ {
+ cls.td_onesecondminfps = fps;
+ cls.td_onesecondmaxfps = fps;
+ }
+ cls.td_onesecondrealtime = realtime;
+ cls.td_onesecondminfps = min(cls.td_onesecondminfps, fps);
+ cls.td_onesecondmaxfps = max(cls.td_onesecondmaxfps, fps);
+ cls.td_onesecondavgfps += fps;
+ cls.td_onesecondavgcount++;
+ cls.td_onesecondframes = 0;
+ cls.td_onesecondnexttime++;
}
- else
- cls.td_minframetime = cls.td_maxframetime = host_realframetime;
}
- else if (cl.time <= cl.mtime[0])
+ else if (cl.time < cl.mtime[0])
{
// don't need another message yet
return;
}
// get the next message
- FS_Read(cls.demofile, &net_message.cursize, 4);
- net_message.cursize = LittleLong(net_message.cursize);
- if (net_message.cursize > net_message.maxsize)
- Host_Error("Demo message (%i) > net_message.maxsize (%i)", net_message.cursize, net_message.maxsize);
+ FS_Read(cls.demofile, &cl_message.cursize, 4);
+ cl_message.cursize = LittleLong(cl_message.cursize);
+ if(cl_message.cursize & DEMOMSG_CLIENT_TO_SERVER) // This is a client->server message! Ignore for now!
+ {
+ // skip over demo packet
+ FS_Seek(cls.demofile, 12 + (cl_message.cursize & (~DEMOMSG_CLIENT_TO_SERVER)), SEEK_CUR);
+ continue;
+ }
+ if (cl_message.cursize > cl_message.maxsize)
+ {
+ Con_Printf("Demo message (%i) > cl_message.maxsize (%i)", cl_message.cursize, cl_message.maxsize);
+ cl_message.cursize = 0;
+ CL_Disconnect();
+ return;
+ }
VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
for (i = 0;i < 3;i++)
{
- r = FS_Read(cls.demofile, &f, 4);
+ FS_Read(cls.demofile, &f, 4);
cl.mviewangles[0][i] = LittleFloat(f);
}
- if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == (size_t)net_message.cursize)
+ if (FS_Read(cls.demofile, cl_message.data, cl_message.cursize) == cl_message.cursize)
{
- MSG_BeginReading();
+ MSG_BeginReading(&cl_message);
CL_ParseServerMessage();
+
+ if (cls.signon != SIGNONS)
+ Cbuf_Execute(); // immediately execute svc_stufftext if in the demo before connect!
+
+ // In case the demo contains a "svc_disconnect" message
+ if (!cls.demoplayback)
+ return;
+
+ if (cls.timedemo)
+ return;
}
else
{
*/
void CL_Stop_f (void)
{
- if (cmd_source != src_command)
- return;
+ sizebuf_t buf;
+ unsigned char bufdata[64];
if (!cls.demorecording)
{
}
// write a disconnect message to the demo file
- SZ_Clear (&net_message);
- MSG_WriteByte (&net_message, svc_disconnect);
- CL_WriteDemoMessage ();
+ // LordHavoc: don't replace the cl_message when doing this
+ buf.data = bufdata;
+ buf.maxsize = sizeof(bufdata);
+ SZ_Clear(&buf);
+ MSG_WriteByte(&buf, svc_disconnect);
+ CL_WriteDemoMessage(&buf);
// finish up
+ if(cl_autodemo.integer && (cl_autodemo_delete.integer & 1))
+ {
+ FS_RemoveOnClose(cls.demofile);
+ Con_Print("Completed and deleted demo\n");
+ }
+ else
+ Con_Print("Completed demo\n");
FS_Close (cls.demofile);
cls.demofile = NULL;
cls.demorecording = false;
- Con_Print("Completed demo\n");
}
/*
{
int c, track;
char name[MAX_OSPATH];
-
- if (cmd_source != src_command)
- return;
+ char vabuf[1024];
c = Cmd_Argc();
if (c != 2 && c != 3 && c != 4)
return;
}
+ if (cls.state == ca_connected)
+ CL_Disconnect();
+
// write the forced cd track number, or -1
if (c == 4)
{
// start the map up
if (c > 2)
- Cmd_ExecuteString ( va("map %s", Cmd_Argv(2)), src_command);
+ Cmd_ExecuteString ( va(vabuf, sizeof(vabuf), "map %s", Cmd_Argv(2)), src_command, false);
// open the demo file
Con_Printf("recording to %s.\n", name);
- cls.demofile = FS_Open (name, "wb", false);
+ cls.demofile = FS_OpenRealFile(name, "wb", false);
if (!cls.demofile)
{
Con_Print("ERROR: couldn't open.\n");
return;
}
+ strlcpy(cls.demoname, name, sizeof(cls.demoname));
cls.forcetrack = track;
FS_Printf(cls.demofile, "%i\n", cls.forcetrack);
cls.demorecording = true;
+ cls.demo_lastcsprogssize = -1;
+ cls.demo_lastcsprogscrc = -1;
}
*/
void CL_PlayDemo_f (void)
{
- char name[256];
+ char name[MAX_QPATH];
int c;
qboolean neg = false;
-
- if (cmd_source != src_command)
- return;
+ qfile_t *f;
if (Cmd_Argc() != 2)
{
return;
}
- // disconnect from server
- CL_Disconnect ();
-
- // update networking ports (this is mainly just needed at startup)
- NetConn_ClientFrame();
-
// open the demo file
strlcpy (name, Cmd_Argv(1), sizeof (name));
FS_DefaultExtension (name, ".dem", sizeof (name));
-
- Con_Printf("Playing demo from %s.\n", name);
- cls.demofile = FS_Open (name, "rb", false);
- if (!cls.demofile)
+ f = FS_OpenVirtualFile(name, false);
+ if (!f)
{
- Con_Print("ERROR: couldn't open.\n");
+ Con_Printf("ERROR: couldn't open %s.\n", name);
cls.demonum = -1; // stop demo loop
return;
}
- SCR_BeginLoadingPlaque ();
+ cls.demostarting = true;
+
+ // disconnect from server
+ CL_Disconnect ();
+ Host_ShutdownServer ();
+
+ // update networking ports (this is mainly just needed at startup)
+ NetConn_UpdateSockets();
+
+ cls.protocol = PROTOCOL_QUAKE;
+ Con_Printf("Playing demo %s.\n", name);
+ cls.demofile = f;
strlcpy(cls.demoname, name, sizeof(cls.demoname));
+
cls.demoplayback = true;
cls.state = ca_connected;
cls.forcetrack = 0;
if (neg)
cls.forcetrack = -cls.forcetrack;
+
+ cls.demostarting = false;
+}
+
+typedef struct
+{
+ int frames;
+ double time, totalfpsavg;
+ double fpsmin, fpsavg, fpsmax;
+}
+benchmarkhistory_t;
+static size_t doublecmp_offset;
+static int doublecmp_withoffset(const void *a_, const void *b_)
+{
+ const double *a = (const double *) ((const char *) a_ + doublecmp_offset);
+ const double *b = (const double *) ((const char *) b_ + doublecmp_offset);
+ if(*a > *b)
+ return +1;
+ if(*a < *b)
+ return -1;
+ return 0;
}
/*
====================
*/
-void CL_FinishTimeDemo (void)
+static void CL_FinishTimeDemo (void)
{
int frames;
- double time; // LordHavoc: changed timedemo accuracy to double
+ int i;
+ double time, totalfpsavg;
double fpsmin, fpsavg, fpsmax; // report min/avg/max fps
+ static int benchmark_runs = 0;
+ char vabuf[1024];
cls.timedemo = false;
-// the first frame didn't count
- frames = (host_framecount - cls.td_startframe) - 1;
+ frames = cls.td_frames;
time = realtime - cls.td_starttime;
- fpsmin = cls.td_maxframetime > 0 ? 1.0 / cls.td_maxframetime : 0;
- fpsavg = time > 0 ? frames / time : 0;
- fpsmax = cls.td_minframetime > 0 ? 1.0 / cls.td_minframetime : 0;
+ totalfpsavg = time > 0 ? frames / time : 0;
+ fpsmin = cls.td_onesecondminfps;
+ fpsavg = cls.td_onesecondavgcount ? cls.td_onesecondavgfps / cls.td_onesecondavgcount : 0;
+ fpsmax = cls.td_onesecondmaxfps;
// LordHavoc: timedemo now prints out 7 digits of fraction, and min/avg/max
- Con_Printf("%i frames %5.7f seconds %5.7f fps\nmin/avg/max: %5.7f/%5.7f/%5.7f\n", frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
- Con_LogPrintf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | result %i frames %5.7f seconds %5.7f fps min/avg/max: %5.7f/%5.7f/%5.7f\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
+ Con_Printf("%i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount);
+ Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | run %d | result %i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, benchmark_runs + 1, frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount);
if (COM_CheckParm("-benchmark"))
- Host_Quit_f();
+ {
+ ++benchmark_runs;
+ i = COM_CheckParm("-benchmarkruns");
+ if(i && i + 1 < com_argc)
+ {
+ static benchmarkhistory_t *history = NULL;
+ if(!history)
+ history = (benchmarkhistory_t *)Z_Malloc(sizeof(*history) * atoi(com_argv[i + 1]));
+
+ history[benchmark_runs - 1].frames = frames;
+ history[benchmark_runs - 1].time = time;
+ history[benchmark_runs - 1].totalfpsavg = totalfpsavg;
+ history[benchmark_runs - 1].fpsmin = fpsmin;
+ history[benchmark_runs - 1].fpsavg = fpsavg;
+ history[benchmark_runs - 1].fpsmax = fpsmax;
+
+ if(atoi(com_argv[i + 1]) > benchmark_runs)
+ {
+ // restart the benchmark
+ Cbuf_AddText(va(vabuf, sizeof(vabuf), "timedemo %s\n", cls.demoname));
+ // cannot execute here
+ }
+ else
+ {
+ // print statistics
+ int first = COM_CheckParm("-benchmarkruns_skipfirst") ? 1 : 0;
+ if(benchmark_runs > first)
+ {
+#define DO_MIN(f) \
+ for(i = first; i < benchmark_runs; ++i) if((i == first) || (history[i].f < f)) f = history[i].f
+
+#define DO_MAX(f) \
+ for(i = first; i < benchmark_runs; ++i) if((i == first) || (history[i].f > f)) f = history[i].f
+
+#define DO_MED(f) \
+ doublecmp_offset = (char *)&history->f - (char *)history; \
+ qsort(history + first, benchmark_runs - first, sizeof(*history), doublecmp_withoffset); \
+ if((first + benchmark_runs) & 1) \
+ f = history[(first + benchmark_runs - 1) / 2].f; \
+ else \
+ f = (history[(first + benchmark_runs - 2) / 2].f + history[(first + benchmark_runs) / 2].f) / 2
+
+ DO_MIN(frames);
+ DO_MAX(time);
+ DO_MIN(totalfpsavg);
+ DO_MIN(fpsmin);
+ DO_MIN(fpsavg);
+ DO_MIN(fpsmax);
+ Con_Printf("MIN: %i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount);
+
+ DO_MED(frames);
+ DO_MED(time);
+ DO_MED(totalfpsavg);
+ DO_MED(fpsmin);
+ DO_MED(fpsavg);
+ DO_MED(fpsmax);
+ Con_Printf("MED: %i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount);
+
+ DO_MAX(frames);
+ DO_MIN(time);
+ DO_MAX(totalfpsavg);
+ DO_MAX(fpsmin);
+ DO_MAX(fpsavg);
+ DO_MAX(fpsmax);
+ Con_Printf("MAX: %i frames %5.7f seconds %5.7f fps, one-second fps min/avg/max: %.0f %.0f %.0f (%i seconds)\n", frames, time, totalfpsavg, fpsmin, fpsavg, fpsmax, cls.td_onesecondavgcount);
+ }
+ Z_Free(history);
+ history = NULL;
+ Host_Quit_f();
+ }
+ }
+ else
+ Host_Quit_f();
+ }
}
/*
*/
void CL_TimeDemo_f (void)
{
- if (cmd_source != src_command)
- return;
-
if (Cmd_Argc() != 2)
{
Con_Print("timedemo <demoname> : gets demo speeds\n");
return;
}
+ srand(0); // predictable random sequence for benchmarking
+
CL_PlayDemo_f ();
// cls.td_starttime will be grabbed at the second frame of the demo, so
// instantly hide console and deactivate it
key_dest = key_game;
key_consoleactive = 0;
- scr_conlines = 0;
scr_con_current = 0;
cls.timedemo = true;
- // get first message this frame
- cls.td_lastframe = -1;
+ cls.td_frames = -2; // skip the first frame
+ cls.demonum = -1; // stop demo loop
}
projects / xonotic / darkplaces.git / blobdiff