X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=prvm_exec.c;h=8adee10ff3fc3a8b654513711b74c7e817a1dcf0;hp=a889f66b1f7b1b01d256d7678b74623605d67786;hb=6e48dafd2f198e53ef8031379080656e9483e709;hpb=631460dc33a02b110ac3b44227afbb4d19cd969d

diff --git a/prvm_exec.c b/prvm_exec.c
index a889f66b..8adee10f 100644
--- a/prvm_exec.c
+++ b/prvm_exec.c
@@ -265,6 +265,74 @@ void PRVM_StackTrace (void)
 	}
 }
 
+void PRVM_ShortStackTrace(char *buf, size_t bufsize)
+{
+	mfunction_t	*f;
+	int			i;
+
+	if(prog)
+	{
+		dpsnprintf(buf, bufsize, "(%s) ", prog->name);
+	}
+	else
+	{
+		strlcpy(buf, "<NO PROG>", sizeof(buf));
+		return;
+	}
+
+	prog->stack[prog->depth].s = prog->xstatement;
+	prog->stack[prog->depth].f = prog->xfunction;
+	for (i = prog->depth;i > 0;i--)
+	{
+		f = prog->stack[i].f;
+
+		if(strlcat(buf,
+			f
+				? va("%s:%s(%i) ", PRVM_GetString(f->s_file), PRVM_GetString(f->s_name), prog->stack[i].s - f->first_statement)
+				: "<NULL> ",
+			bufsize
+		) >= bufsize)
+			break;
+	}
+}
+
+
+void PRVM_CallProfile ()
+{
+	mfunction_t *f, *best;
+	int i;
+	double max;
+	double sum;
+
+	Con_Printf( "%s Call Profile:\n", PRVM_NAME );
+
+	sum = 0;
+	do
+	{
+		max = 0;
+		best = NULL;
+		for (i=0 ; i<prog->progs->numfunctions ; i++)
+		{
+			f = &prog->functions[i];
+			if (max < f->totaltime)
+			{
+				max = f->totaltime;
+				best = f;
+			}
+		}
+		if (best)
+		{
+			sum += best->totaltime;
+			Con_Printf("%9.4f %s\n", best->totaltime, PRVM_GetString(best->s_name));
+			best->totaltime = 0;
+		}
+	} while (best);
+
+	Con_Printf("Total time since last profile reset: %9.4f\n", Sys_DoubleTime() - prog->starttime);
+	Con_Printf("       - used by QC code of this VM: %9.4f\n", sum);
+
+	prog->starttime = Sys_DoubleTime();
+}
 
 void PRVM_Profile (int maxfunctions, int mininstructions)
 {
@@ -305,6 +373,29 @@ void PRVM_Profile (int maxfunctions, int mininstructions)
 	} while (best);
 }
 
+/*
+============
+PRVM_CallProfile_f
+
+============
+*/
+void PRVM_CallProfile_f (void)
+{
+	if (Cmd_Argc() != 2)
+	{
+		Con_Print("prvm_callprofile <program name>\n");
+		return;
+	}
+
+	PRVM_Begin;
+	if(!PRVM_SetProgFromString(Cmd_Argv(1)))
+		return;
+
+	PRVM_CallProfile();
+
+	PRVM_End;
+}
+
 /*
 ============
 PRVM_Profile_f
@@ -364,17 +455,27 @@ void PRVM_PrintState(void)
 }
 
 extern sizebuf_t vm_tempstringsbuf;
+extern cvar_t prvm_errordump;
+void Host_Savegame_to (const char *name);
 void PRVM_Crash(void)
 {
 	if (prog == NULL)
 		return;
 
+	prog->funcoffsets.SV_Shutdown = 0; // don't call SV_Shutdown on crash
+
 	if( prog->depth > 0 )
 	{
 		Con_Printf("QuakeC crash report for %s:\n", PRVM_NAME);
 		PRVM_PrintState();
 	}
 
+	if(prvm_errordump.integer)
+	{
+		// make a savegame
+		Host_Savegame_to(va("crash-%s.dmp", PRVM_NAME));
+	}
+
 	// dump the stack so host_error can shutdown functions
 	prog->depth = 0;
 	prog->localstack_used = 0;
@@ -485,7 +586,9 @@ PRVM_ExecuteProgram
 #define OPA ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->a])
 #define OPB ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->b])
 #define OPC ((prvm_eval_t *)&prog->globals.generic[(unsigned short) st->c])
+#ifdef PRVM_BOUNDSCHECK_CVAR
 extern cvar_t prvm_boundscheck;
+#endif
 extern cvar_t prvm_traceqc;
 extern cvar_t prvm_statementprofiling;
 extern sizebuf_t vm_tempstringsbuf;
@@ -497,6 +600,9 @@ void PRVM_ExecuteProgram (func_t fnum, const char *errormessage)
 	prvm_eval_t	*ptr;
 	int		jumpcount, cachedpr_trace, exitdepth;
 	int		restorevm_tempstringsbuf_cursize;
+	double  calltime;
+
+	calltime = Sys_DoubleTime();
 
 	if (!fnum || fnum >= (unsigned int)prog->progs->numfunctions)
 	{
@@ -531,7 +637,9 @@ chooseexecprogram:
 	if (prvm_statementprofiling.integer)
 	{
 #define PRVMSTATEMENTPROFILING 1
+#ifdef PRVM_BOUNDSCHECK_CVAR
 		if (prvm_boundscheck.integer)
+#endif
 		{
 #define PRVMBOUNDSCHECK 1
 			if (prog->trace)
@@ -546,6 +654,7 @@ chooseexecprogram:
 			}
 #undef PRVMBOUNDSCHECK
 		}
+#ifdef PRVM_BOUNDSCHECK_CVAR
 		else
 		{
 			if (prog->trace)
@@ -559,11 +668,14 @@ chooseexecprogram:
 #include "prvm_execprogram.h"
 			}
 		}
+#endif
 #undef PRVMSTATEMENTPROFILING
 	}
 	else
 	{
+#ifdef PRVM_BOUNDSCHECK_CVAR
 		if (prvm_boundscheck.integer)
+#endif
 		{
 #define PRVMBOUNDSCHECK 1
 			if (prog->trace)
@@ -578,6 +690,7 @@ chooseexecprogram:
 			}
 #undef PRVMBOUNDSCHECK
 		}
+#ifdef PRVM_BOUNDSCHECK_CVAR
 		else
 		{
 			if (prog->trace)
@@ -591,6 +704,7 @@ chooseexecprogram:
 #include "prvm_execprogram.h"
 			}
 		}
+#endif
 	}
 
 cleanup:
@@ -599,5 +713,7 @@ cleanup:
 	// delete tempstrings created by this function
 	vm_tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 
+	prog->functions[fnum].totaltime += (Sys_DoubleTime() - calltime);
+
 	SV_FlushBroadcastMessages();
 }