adaptive profiler history length (not really)

diff --git a/src/game/g_game.pas b/src/game/g_game.pas
index d6a3eb2472986ccc5ab587367f81618573eeceae..cc97e4c65d63700db25e1dd6489179803ef8d0de 100644 (file)
--- a/src/game/g_game.pas
+++ b/src/game/g_game.pas
@@ -313,6 +313,7 @@ var
   g_profile_frame_update: Boolean = false;
   g_profile_frame_draw: Boolean = false;
   g_profile_collision: Boolean = false;
+  g_profile_history_size: Integer = 1000;
 
 procedure g_ResetDynlights ();
 procedure g_AddDynLight (x, y, radius: Integer; r, g, b, a: Single);
@@ -2749,7 +2750,7 @@ begin
     Exit;
   end;
 
-  if (profileFrameDraw = nil) then profileFrameDraw := TProfiler.Create('MAP RENDER');
+  if (profileFrameDraw = nil) then profileFrameDraw := TProfiler.Create('MAP RENDER', g_profile_history_size);
   profileFrameDraw.mainBegin(g_profile_frame_draw);
 
   gPlayerDrawn := p;

diff --git a/src/game/g_map.pas b/src/game/g_map.pas
index 2579d27fb143ab75fab9dab09da7e4d2a3a20c80..29750c92009aeb5a36a4bb13fd2601bf22c521ff 100644 (file)
--- a/src/game/g_map.pas
+++ b/src/game/g_map.pas
@@ -200,7 +200,7 @@ var
 
 procedure g_Map_ProfilersBegin ();
 begin
-  if (profMapCollision = nil) then profMapCollision := TProfiler.Create('MAP COLLISION');
+  if (profMapCollision = nil) then profMapCollision := TProfiler.Create('MAP COLLISION', g_profile_history_size);
   profMapCollision.mainBegin(g_profile_collision);
   // create sections
   if g_profile_collision then

diff --git a/src/game/g_window.pas b/src/game/g_window.pas
index e3226eae84f4e6446f0474434e28d8b81782150c..450afde4334c352e216dab131aaf1ae687d647b3 100644 (file)
--- a/src/game/g_window.pas
+++ b/src/game/g_window.pas
@@ -708,6 +708,7 @@ begin
   begin
     if ParamStr(idx) = '--opengl-dump-exts' then gwin_dump_extensions := true;
     if ParamStr(idx) = '--twinkletwinkle' then gwin_k8_enable_light_experiments := true;
+    if ParamStr(idx) = '--jah' then g_profile_history_size := 100;
   end;
 
   e_WriteLog('Initializing OpenGL', MSG_NOTIFY);

diff --git a/src/shared/xprofiler.pas b/src/shared/xprofiler.pas
index ac9b54bd4267fde25ed2112560ee92ccfccda20c..51d99e8b0e0e8fd155b8aa256add97d1fde688bd 100644 (file)
--- a/src/shared/xprofiler.pas
+++ b/src/shared/xprofiler.pas
@@ -75,10 +75,10 @@ const
 type
   TProfilerBar = record
   private
-    const FilterFadeoff = 0.05; // 5%
+    //const FilterFadeoff = 0.05; // 5%
 
   private
-    history: array [0..TProfHistorySize-1] of Integer; // circular buffer
+    history: array of Integer; // circular buffer
     hisLast: Integer;
     //curval: Single;
     curAccum: UInt64;
@@ -87,7 +87,7 @@ type
     mLevel: Integer;
 
   private
-    procedure initialize (); inline;
+    procedure initialize (aHistSize: Integer); inline;
     function getvalue (): Integer; inline;
     function getvalat (idx: Integer): Integer; inline;
     function getcount (): Integer; inline;
@@ -124,9 +124,10 @@ type
   public
     bars: array of TProfilerBar; // 0: total time
     name: AnsiString;
+    histSize: Integer;
 
   public
-    constructor Create (aName: AnsiString);
+    constructor Create (aName: AnsiString; aHistSize: Integer);
     destructor Destroy (); override;
 
     // call this on frame start
@@ -270,17 +271,17 @@ end;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-procedure TProfilerBar.initialize (); begin hisLast := -1; curAccum := 0; curAccumCount := 0; end;
+procedure TProfilerBar.initialize (aHistSize: Integer); begin SetLength(history, aHistSize); hisLast := -1; curAccum := 0; curAccumCount := 0; end;
 
 procedure TProfilerBar.update (val: Integer);
 var
   idx: Integer;
 begin
   if (val < 0) then val := 0; //else if (val > 1000000) val := 1000000;
-  if (hisLast = -1) then begin hisLast := TProfHistorySize-1; curAccum := 0; curAccumCount := 0; for idx := 0 to TProfHistorySize-1 do history[idx] := val; end;
-  if (curAccumCount = TProfHistorySize) then Dec(curAccum, UInt64(history[(hisLast+1) mod TProfHistorySize])) else Inc(curAccumCount);
+  if (hisLast = -1) then begin hisLast := High(history); curAccum := 0; curAccumCount := 0; for idx := 0 to High(history) do history[idx] := val; end;
+  if (curAccumCount = Length(history)) then Dec(curAccum, UInt64(history[(hisLast+1) mod Length(history)])) else Inc(curAccumCount);
   Inc(hisLast);
-  if (hisLast >= TProfHistorySize) then hisLast := 0;
+  if (hisLast >= Length(history)) then hisLast := 0;
   Inc(curAccum, UInt64(val));
   history[hisLast] := val;
   //curval := FilterFadeoff*val+(1.0-FilterFadeoff)*curval;
@@ -293,27 +294,30 @@ var idx: Integer;
 begin
   {$IFDEF XPROFILER_SLOW_AVERAGE}
   result := 0;
-  for idx := 0 to TProfHistorySize-1 do Inc(result, history[idx]);
-  result := result div TProfHistorySize;
+  for idx := 0 to High(history) do Inc(result, history[idx]);
+  result := result div Length(history);
   {$ELSE}
   //result := round(curval);
   if curAccumCount > 0 then result := Integer(curAccum div curAccumCount) else result := 0;
   {$ENDIF}
 end;
 
-function TProfilerBar.getcount (): Integer; begin result := TProfHistorySize; end;
+function TProfilerBar.getcount (): Integer; begin result := Length(history); end;
 
 function TProfilerBar.getvalat (idx: Integer): Integer;
 begin
-  if (idx < 0) or (idx >= TProfHistorySize) then result := 0 else result := history[(hisLast-idx+TProfHistorySize*2) mod TProfHistorySize];
+  if (idx < 0) or (idx >= Length(history)) then result := 0 else result := history[(hisLast-idx+Length(history)*2) mod Length(history)];
 end;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
-constructor TProfiler.Create (aName: AnsiString);
+constructor TProfiler.Create (aName: AnsiString; aHistSize: Integer);
 begin
   name := aName;
   bars := nil;
+  if (aHistSize < 10) then aHistSize := 10;
+  if (aHistSize > 10000) then aHistSize := 10000;
+  histSize := aHistSize;
   {$IF DEFINED(STOPWATCH_IS_HERE)}
   xptimer.clear();
   xpsecs := nil;
@@ -324,7 +328,10 @@ end;
 
 
 destructor TProfiler.Destroy ();
+var
+  idx: Integer;
 begin
+  for idx := 0 to High(bars) do bars[idx].history := nil;
   bars := nil;
   {$IF DEFINED(STOPWATCH_IS_HERE)}
   xpsecs := nil;
@@ -378,11 +385,11 @@ begin
       SetLength(bars, xpsused+1);
       for idx := 1 to xpsused do
       begin
-        bars[idx].initialize();
+        bars[idx].initialize(histSize);
         bars[idx].mName := xpsecs[idx-1].name;
         bars[idx].mLevel := xpsecs[idx-1].level+1;
       end;
-      bars[0].initialize();
+      bars[0].initialize(histSize);
       bars[0].mName := name;
       bars[0].mLevel := 0;
     end;
@@ -401,7 +408,7 @@ begin
     if (length(bars) <> 1) then
     begin
       SetLength(bars, 1);
-      bars[0].initialize();
+      bars[0].initialize(histSize);
       bars[0].mName := name;
       bars[0].mLevel := 0;
     end;