index ac9b54bd4267fde25ed2112560ee92ccfccda20c..f61b844edb9133b04ff5d01172949058729d7aae 100644 (file)
--- a/src/shared/xprofiler.pas
+++ b/src/shared/xprofiler.pas
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;
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;
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
// call this on frame end
procedure mainEnd ();
- procedure sectionBegin (name: AnsiString);
+ procedure sectionBegin (aName: AnsiString);
procedure sectionEnd ();
// this will reuse the section with the given name (if there is any); use `sectionEnd()` to end it as usual
- procedure sectionBeginAccum (name: AnsiString);
+ procedure sectionBeginAccum (aName: AnsiString);
end;
+function getTimeMicro (): UInt64; inline;
+function getTimeMilli (): UInt64; inline;
+
+
implementation
{$IF DEFINED(LINUX)}
end;
-function curTimeMicro (): UInt64; inline;
+function getTimeMicro (): UInt64; inline;
var
r: THPTimeType;
begin
- if (mFrequency = 0) then initTimerIntr();
+ //if (mFrequency = 0) then initTimerIntr();
{$IF DEFINED(LINUX)}
clock_gettime(CLOCK_MONOTONIC, @r);
result := UInt64(r.tv_sec)*1000000+UInt64(r.tv_nsec) div 1000; // microseconds
end;
+function getTimeMilli (): UInt64; inline;
+begin
+ result := getTimeMicro div 1000;
+end;
+
+
// ////////////////////////////////////////////////////////////////////////// //
class function TStopWatch.Create (): TStopWatch;
begin
var
e: UInt64;
begin
- e := curTimeMicro();
+ e := getTimeMicro();
if (mStartPosition > e) then mStartPosition := e;
Inc(mElapsed, e-mStartPosition);
mStartPosition := e;
procedure TStopWatch.start (reset: Boolean=true);
begin
if mRunning and not reset then exit; // nothing to do
- mStartPosition := curTimeMicro();
+ mStartPosition := getTimeMicro();
mRunning := true;
if (reset) then mElapsed := 0;
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;
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;
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;
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;
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;
{$ENDIF}
end;
-procedure TProfiler.sectionBegin (name: AnsiString);
+procedure TProfiler.sectionBegin (aName: AnsiString);
{$IF DEFINED(STOPWATCH_IS_HERE)}
var
sid: Integer;
sid := xpsused;
Inc(xpsused);
pss := @xpsecs[sid];
- pss.name := name;
+ pss.name := aName;
pss.timer.clear();
pss.prevAct := xpscur;
// calculate level
{$ENDIF}
end;
-procedure TProfiler.sectionBeginAccum (name: AnsiString);
+procedure TProfiler.sectionBeginAccum (aName: AnsiString);
{$IF DEFINED(STOPWATCH_IS_HERE)}
var
idx: Integer;
begin
for idx := 0 to xpsused-1 do
begin
- if (xpsecs[idx].name = name) then
+ if (xpsecs[idx].name = aName) then
begin
- if (idx = xpscur) then raise Exception.Create('profiler error(0): dobule resume: "'+name+'"');
- if (xpsecs[idx].prevAct <> -1) then raise Exception.Create('profiler error(1): dobule resume: "'+name+'"');
+ if (idx = xpscur) then raise Exception.Create('profiler error(0): dobule resume: "'+aName+'"');
+ if (xpsecs[idx].prevAct <> -1) then raise Exception.Create('profiler error(1): dobule resume: "'+aName+'"');
xpsecs[idx].prevAct := xpscur;
xpscur := idx;
xpsecs[idx].timer.resume();
end;
end;
end;
- sectionBegin(name);
+ sectionBegin(aName);
{$ENDIF}
end;
end;
+begin
+ initTimerIntr();
end.