X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2Fxprofiler.pas;h=be2a86a28d68881d128e8ce49d47883bf04db57a;hb=987c4a835a103345b59937e8e1be8524a6228712;hp=6fb00357b467071a192a46556511fd86b0021780;hpb=c4f5c9d83f401ccc223dad213eec2a6b6f8a6b23;p=d2df-sdl.git

diff --git a/src/shared/xprofiler.pas b/src/shared/xprofiler.pas
index 6fb0035..be2a86a 100644
--- a/src/shared/xprofiler.pas
+++ b/src/shared/xprofiler.pas
@@ -1,9 +1,8 @@
-(* Copyright (C)  DooM 2D:Forever Developers
+(* Copyright (C)  Doom 2D: Forever Developers
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * the Free Software Foundation, version 3 of the License ONLY.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -20,14 +19,24 @@ unit xprofiler;
 
 interface
 
-uses
-  SysUtils,
-  {$IF DEFINED(LINUX)}
+{$IFNDEF IN_TOOLS}
+  uses
+    SysUtils;
+
+  {$DEFINE STOPWATCH_IS_HERE}
+
+{$ELSE}
+  uses
+    SysUtils
+  {$IF DEFINED(LINUX) OR DEFINED(ANDROID)}
     {$DEFINE STOPWATCH_IS_HERE}
-    unixtype, linux
+    , unixtype, linux
   {$ELSEIF DEFINED(WINDOWS)}
     {$DEFINE STOPWATCH_IS_HERE}
-    Windows
+    , Windows
+  {$ELSEIF DEFINED(HAIKU)}
+    {$DEFINE STOPWATCH_IS_HERE}
+    , unixtype
   {$ELSE}
     {$IFDEF STOPWATCH_IS_HERE}
       {$UNDEF STOPWATCH_IS_HERE}
@@ -35,6 +44,7 @@ uses
     {$WARNING You suck!}
   {$ENDIF}
   ;
+{$ENDIF} // IN_TOOLS
 
 {$IF DEFINED(STOPWATCH_IS_HERE)}
 type
@@ -143,12 +153,19 @@ type
   end;
 
 
-function curTimeMicro (): UInt64; inline;
-function curTimeMilli (): UInt64; inline;
+function getTimeMicro (): UInt64; inline;
+function getTimeMilli (): UInt64; inline;
 
 
 implementation
 
+{$IFNDEF IN_TOOLS}
+uses
+  SDL2;
+
+type
+  THPTimeType = Int64;
+{$ELSE}
 {$IF DEFINED(LINUX)}
 type THPTimeType = TTimeSpec;
 {$ELSE}
@@ -158,13 +175,17 @@ type THPTimeType = Int64;
 var
   mFrequency: Int64 = 0;
   mHasHPTimer: Boolean = false;
+{$ENDIF}
 
 
 // ////////////////////////////////////////////////////////////////////////// //
 procedure initTimerIntr ();
+{$IFDEF IN_TOOLS}
 var
   r: THPTimeType;
+{$ENDIF}
 begin
+{$IFDEF IN_TOOLS}
   if (mFrequency = 0) then
   begin
 {$IF DEFINED(LINUX)}
@@ -173,16 +194,19 @@ begin
     if not mHasHPTimer then raise Exception.Create('profiler error: hires timer is not available');
     mFrequency := 1; // just a flag
     if (r.tv_nsec <> 0) then mFrequency := 1000000000000000000 div r.tv_nsec;
-{$ELSE}
+{$ELSEIF DEFINED(WINDOWS)}
     mHasHPTimer := QueryPerformanceFrequency(r);
     if not mHasHPTimer then raise Exception.Create('profiler error: hires timer is not available');
     mFrequency := r;
 {$ENDIF}
   end;
+{$ENDIF}
+  (* init sdl timers? *)
 end;
 
 
-function curTimeMicro (): UInt64; inline;
+{$IFDEF IN_TOOLS}
+function getTimeMicro (): UInt64; inline;
 var
   r: THPTimeType;
 begin
@@ -190,16 +214,22 @@ begin
   {$IF DEFINED(LINUX)}
   clock_gettime(CLOCK_MONOTONIC, @r);
   result := UInt64(r.tv_sec)*1000000+UInt64(r.tv_nsec) div 1000; // microseconds
-  {$ELSE}
+  {$ELSEIF DEFINED(WINDOWS)}
   QueryPerformanceCounter(r);
   result := UInt64(r)*1000000 div mFrequency;
   {$ENDIF}
 end;
+{$ELSE}
+function getTimeMicro (): UInt64; inline;
+begin
+  Result := SDL_GetPerformanceCounter() * 1000000 div SDL_GetPerformanceFrequency()
+end;
+{$ENDIF}
 
 
-function curTimeMilli (): UInt64; inline;
+function getTimeMilli (): UInt64; inline;
 begin
-  result := curTimeMicro div 1000;
+  result := getTimeMicro div 1000;
 end;
 
 
@@ -221,7 +251,7 @@ procedure TStopWatch.updateElapsed ();
 var
   e: UInt64;
 begin
-  e := curTimeMicro();
+  e := getTimeMicro();
   if (mStartPosition > e) then mStartPosition := e;
   Inc(mElapsed, e-mStartPosition);
   mStartPosition := e;
@@ -253,7 +283,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;
@@ -465,8 +495,8 @@ begin
     begin
       if (xpsecs[idx].name = aName) then
       begin
-        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+'"');
+        if (idx = xpscur) then raise Exception.Create('profiler error(0): double resume: "'+aName+'"');
+        if (xpsecs[idx].prevAct <> -1) then raise Exception.Create('profiler error(1): double resume: "'+aName+'"');
         xpsecs[idx].prevAct := xpscur;
         xpscur := idx;
         xpsecs[idx].timer.resume();