X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_demo.c;h=26265ff48553abc15a439f7f461ba6ea8fbca9ec;hp=b38a2db5d9f18a70aac5bf01e6c7381b6b2e2464;hb=35a210359bf175b1798c62e196116a19b7181006;hpb=dbce962f09403fd5888d0bd858ceefc90bc3ea2b diff --git a/cl_demo.c b/cl_demo.c index b38a2db5..26265ff4 100644 --- a/cl_demo.c +++ b/cl_demo.c @@ -8,7 +8,7 @@ of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. @@ -20,15 +20,21 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #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); /* ============================================================================== DEMO CODE -When a demo is playing back, all NET_SendMessages are skipped, and -NET_GetMessages are read from the demo file. +When a demo is playing back, all outgoing network messages are skipped, and +incoming messages are read from the demo file. Whenever cl.time gets past the last received message, another message is read from the demo file. @@ -44,7 +50,7 @@ Called to play the next demo in the demo loop */ void CL_NextDemo (void) { - char str[1024]; + char str[MAX_INPUTLINE]; if (cls.demonum == -1) return; // don't play demos @@ -54,13 +60,13 @@ void CL_NextDemo (void) cls.demonum = 0; if (!cls.demos[cls.demonum][0]) { - Con_Printf ("No demos listed with startdemos\n"); + Con_Print("No demos listed with startdemos\n"); cls.demonum = -1; return; } } - 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++; } @@ -75,15 +81,25 @@ Called when a demo file runs out, or the user starts a game // 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; - Qclose (cls.demofile); + FS_Close (cls.demofile); cls.demoplayback = false; cls.demofile = NULL; 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(); + } /* @@ -91,9 +107,9 @@ void CL_StopPlayback (void) 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; @@ -102,93 +118,178 @@ void CL_WriteDemoMessage (void) if (cls.demopaused) // LordHavoc: pausedemo return; - len = LittleLong (net_message.cursize); - Qwrite (cls.demofile, &len, 4); + len = LittleLong (message->cursize); + FS_Write (cls.demofile, &len, 4); for (i=0 ; i<3 ; i++) { f = LittleFloat (cl.viewangles[i]); - Qwrite (cls.demofile, &f, 4); + FS_Write (cls.demofile, &f, 4); } - Qwrite (cls.demofile, net_message.data, net_message.cursize); - Qflush (cls.demofile); + FS_Write (cls.demofile, message->data, message->cursize); } /* ==================== -CL_GetMessage +CL_CutDemo -Handles recording and playback of demos, on top of NET_ code +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. ==================== */ -int CL_GetMessage (void) +void CL_CutDemo (unsigned char **buf, fs_offset_t *filesize) { - int r, i; - float f; - - if (cls.demoplayback) - { - if (cls.demopaused) // LordHavoc: pausedemo - return 0; + *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; +} - // decide if it is time to grab the next message - if (cls.signon == SIGNONS) // always grab until fully connected +/* +==================== +CL_ReadDemoMessage + +Handles playback of demos +==================== +*/ +void CL_ReadDemoMessage(void) +{ + int i; + float f; + + if (!cls.demoplayback) + return; + + // LordHavoc: pausedemo + if (cls.demopaused) + return; + + for (;;) + { + // decide if it is time to grab the next message + // always grab until fully connected + if (cls.signon == SIGNONS) { if (cls.timedemo) { - if (host_framecount == cls.td_lastframe) - return 0; // already read this frame's message - cls.td_lastframe = host_framecount; - // if this is the second frame, grab the real td_starttime - // so the bogus time on the first frame doesn't count - if (host_framecount == cls.td_startframe + 1) + 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 (cls.td_frames == 0) + { cls.td_starttime = realtime; + 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) + { + 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 if (cl.time <= cl.mtime[0]) + else if (cl.time < cl.mtime[0]) { - return 0; // don't need another message yet + // don't need another message yet + return; } } - - // get the next message - Qread (cls.demofile, &net_message.cursize, 4); - VectorCopy (cl.mviewangles[0], cl.mviewangles[1]); - for (i=0 ; i<3 ; i++) + + // get the next message + 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) { - r = Qread (cls.demofile, &f, 4); - cl.mviewangles[0][i] = LittleFloat (f); + Con_Printf("Demo message (%i) > cl_message.maxsize (%i)", cl_message.cursize, cl_message.maxsize); + cl_message.cursize = 0; + CL_Disconnect(); + return; } - - net_message.cursize = LittleLong (net_message.cursize); - if (net_message.cursize > MAX_MSGLEN) - Host_Error ("Demo message > MAX_MSGLEN"); - r = Qread (cls.demofile, net_message.data, net_message.cursize); - if (r != net_message.cursize) + VectorCopy(cl.mviewangles[0], cl.mviewangles[1]); + for (i = 0;i < 3;i++) { - CL_Disconnect (); - return 0; + FS_Read(cls.demofile, &f, 4); + cl.mviewangles[0][i] = LittleFloat(f); } - - return 1; - } - while (1) - { - r = NET_GetMessage (cls.netcon); - - if (r != 1 && r != 2) - return r; - - // discard nop keepalive message - if (net_message.cursize == 1 && net_message.data[0] == svc_nop) - Con_Printf ("<-- server to client keepalive\n"); + if (FS_Read(cls.demofile, cl_message.data, cl_message.cursize) == cl_message.cursize) + { + 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 - break; + { + CL_Disconnect(); + return; + } } - - if (cls.demorecording) - CL_WriteDemoMessage (); - - return r; } @@ -201,25 +302,34 @@ stop recording a demo */ void CL_Stop_f (void) { - if (cmd_source != src_command) - return; + sizebuf_t buf; + unsigned char bufdata[64]; if (!cls.demorecording) { - Con_Printf ("Not recording a demo.\n"); + Con_Print("Not recording a demo.\n"); return; } // 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 - Qclose (cls.demofile); + 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_Printf ("Completed demo\n"); } /* @@ -231,66 +341,65 @@ record [cd track] */ void CL_Record_f (void) { - int c; - char name[MAX_OSPATH]; - int track; - - if (cmd_source != src_command) - return; + int c, track; + char name[MAX_OSPATH]; + char vabuf[1024]; c = Cmd_Argc(); if (c != 2 && c != 3 && c != 4) { - Con_Printf ("record [ [cd track]]\n"); + Con_Print("record [ [cd track]]\n"); return; } if (strstr(Cmd_Argv(1), "..")) { - Con_Printf ("Relative pathnames are not allowed.\n"); + Con_Print("Relative pathnames are not allowed.\n"); return; } if (c == 2 && cls.state == ca_connected) { - Con_Printf("Can not record - already connected to server\nClient demo recording must be started before connecting\n"); + Con_Print("Can not record - already connected to server\nClient demo recording must be started before connecting\n"); return; } -// write the forced cd track number, or -1 + if (cls.state == ca_connected) + CL_Disconnect(); + + // write the forced cd track number, or -1 if (c == 4) { track = atoi(Cmd_Argv(3)); - Con_Printf ("Forcing CD track to %i\n", cls.forcetrack); + Con_Printf("Forcing CD track to %i\n", cls.forcetrack); } else - track = -1; + track = -1; + + // get the demo name + strlcpy (name, Cmd_Argv(1), sizeof (name)); + FS_DefaultExtension (name, ".dem", sizeof (name)); - sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1)); - -// -// start the map up -// + // start the map up if (c > 2) - Cmd_ExecuteString ( va("map %s", Cmd_Argv(2)), src_command); - -// -// open the demo file -// - COM_DefaultExtension (name, ".dem"); - - Con_Printf ("recording to %s.\n", name); - cls.demofile = Qopen (name, "wb"); + 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_OpenRealFile(name, "wb", false); if (!cls.demofile) { - Con_Printf ("ERROR: couldn't open.\n"); + Con_Print("ERROR: couldn't open.\n"); return; } + strlcpy(cls.demoname, name, sizeof(cls.demoname)); cls.forcetrack = track; - Qprintf (cls.demofile, "%i\n", cls.forcetrack); + FS_Printf(cls.demofile, "%i\n", cls.forcetrack); cls.demorecording = true; + cls.demo_lastcsprogssize = -1; + cls.demo_lastcsprogscrc = -1; } @@ -303,46 +412,48 @@ play [demoname] */ 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) { - Con_Printf ("play : plays a demo\n"); + Con_Print("play : plays a demo\n"); return; } -// -// disconnect from server -// - CL_Disconnect (); - -// -// open the demo file -// - strcpy (name, Cmd_Argv(1)); - COM_DefaultExtension (name, ".dem"); - - Con_Printf ("Playing demo from %s.\n", name); - COM_FOpenFile (name, &cls.demofile, false, true); - if (!cls.demofile) + // open the demo file + strlcpy (name, Cmd_Argv(1), sizeof (name)); + FS_DefaultExtension (name, ".dem", sizeof (name)); + f = FS_OpenVirtualFile(name, false); + if (!f) { - Con_Printf ("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; - while ((c = Qgetc(cls.demofile)) != '\n') + while ((c = FS_Getc (cls.demofile)) != '\n') if (c == '-') neg = true; else @@ -350,6 +461,27 @@ void CL_PlayDemo_f (void) 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; } /* @@ -358,20 +490,101 @@ CL_FinishTimeDemo ==================== */ -void CL_FinishTimeDemo (void) +static void CL_FinishTimeDemo (void) { - int frames; - double time; // LordHavoc: changed timedemo accuracy to double - + int frames; + 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; - if (!time) - time = 1; - // LordHavoc: timedemo now prints out 7 digits of fraction - Con_Printf ("%i frames %5.7f seconds %5.7f fps\n", frames, time, frames/time); + 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, 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")) + { + ++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(); + } } /* @@ -383,15 +596,14 @@ timedemo [demoname] */ void CL_TimeDemo_f (void) { - if (cmd_source != src_command) - return; - if (Cmd_Argc() != 2) { - Con_Printf ("timedemo : gets demo speeds\n"); + Con_Print("timedemo : 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 @@ -400,11 +612,10 @@ void CL_TimeDemo_f (void) // instantly hide console and deactivate it key_dest = key_game; key_consoleactive = 0; - scr_conlines = 0; scr_con_current = 0; cls.timedemo = true; - cls.td_startframe = host_framecount; - cls.td_lastframe = -1; // get a new message this frame + cls.td_frames = -2; // skip the first frame + cls.demonum = -1; // stop demo loop }