X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fxprofiler.pas;h=f61b844edb9133b04ff5d01172949058729d7aae;hb=9e198c59ced795c654bc7b028d5aedc5f23b53dd;hp=51d99e8b0e0e8fd155b8aa256add97d1fde688bd;hpb=4af2b6eac9b465e95af873343c21d244d1e74a75;p=d2df-sdl.git

diff --git a/src/shared/xprofiler.pas b/src/shared/xprofiler.pas
index 51d99e8..f61b844 100644
--- a/src/shared/xprofiler.pas
+++ b/src/shared/xprofiler.pas
@@ -135,14 +135,18 @@ type
     // 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)}
@@ -178,11 +182,11 @@ begin
 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
@@ -193,6 +197,12 @@ begin
 end;
 
 
+function getTimeMilli (): UInt64; inline;
+begin
+  result := getTimeMicro div 1000;
+end;
+
+
 // ////////////////////////////////////////////////////////////////////////// //
 class function TStopWatch.Create (): TStopWatch;
 begin
@@ -211,7 +221,7 @@ procedure TStopWatch.updateElapsed ();
 var
   e: UInt64;
 begin
-  e := curTimeMicro();
+  e := getTimeMicro();
   if (mStartPosition > e) then mStartPosition := e;
   Inc(mElapsed, e-mStartPosition);
   mStartPosition := e;
@@ -243,7 +253,7 @@ end;
 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;
@@ -417,7 +427,7 @@ begin
   {$ENDIF}
 end;
 
-procedure TProfiler.sectionBegin (name: AnsiString);
+procedure TProfiler.sectionBegin (aName: AnsiString);
 {$IF DEFINED(STOPWATCH_IS_HERE)}
 var
   sid: Integer;
@@ -431,7 +441,7 @@ begin
   sid := xpsused;
   Inc(xpsused);
   pss := @xpsecs[sid];
-  pss.name := name;
+  pss.name := aName;
   pss.timer.clear();
   pss.prevAct := xpscur;
   // calculate level
@@ -441,7 +451,7 @@ begin
   {$ENDIF}
 end;
 
-procedure TProfiler.sectionBeginAccum (name: AnsiString);
+procedure TProfiler.sectionBeginAccum (aName: AnsiString);
 {$IF DEFINED(STOPWATCH_IS_HERE)}
 var
   idx: Integer;
@@ -453,10 +463,10 @@ begin
   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();
@@ -464,7 +474,7 @@ begin
       end;
     end;
   end;
-  sectionBegin(name);
+  sectionBegin(aName);
   {$ENDIF}
 end;
 
@@ -486,4 +496,6 @@ begin
 end;
 
 
+begin
+  initTimerIntr();
 end.