fixed repeating the same task if processmessages inside handler

[lcore.git] / btime.pas

diff --git a/btime.pas b/btime.pas
index df4f91ec8f301bc59de4912b0fe46f38ba395db4..46cdf48a74189538993306a5985bd3fa7fa996c2 100644 (file)
--- a/btime.pas
+++ b/btime.pas
@@ -9,6 +9,11 @@ works on windows/delphi, and on freepascal on unix.
 \r
 \r
 unit btime;\r
 \r
 \r
 unit btime;\r

+{$ifdef fpc}\r
+  {$mode delphi}\r
+{$endif}\r
+\r
+{$include lcoreconfig.inc}\r

 \r
 interface\r
 \r
 \r
 interface\r
 \r


@@ -31,6 +36,7 @@ var
   tickcount:integer;\r
   settimebias:tunixtimeint;\r
   performancecountfreq:extended;\r
   tickcount:integer;\r
   settimebias:tunixtimeint;\r
   performancecountfreq:extended;\r

+  btimenowin8:boolean;\r

 \r
 function irctimefloat:float;\r
 function irctimeint:tunixtimeint;\r
 \r
 function irctimefloat:float;\r
 function irctimeint:tunixtimeint;\r


@@ -55,6 +61,9 @@ function timestrshort(i:tunixtimeint):string;    // Wed Aug 15 16:21:09 2012
 function timestriso(i:tunixtimeint):string;      // 2012-08-15 16:21:09\r
 function timestrisoutc(i:float):string;          // 2012-08-15T14:21:09.255553Z\r
 \r
 function timestriso(i:tunixtimeint):string;      // 2012-08-15 16:21:09\r
 function timestrisoutc(i:float):string;          // 2012-08-15T14:21:09.255553Z\r
 \r

+procedure beginhightimerrate;\r
+procedure endhightimerrate;\r
+\r

 {$ifdef mswindows}\r
 function unixtimefloat_systemtime:float;\r
 {$endif}\r
 {$ifdef mswindows}\r
 function unixtimefloat_systemtime:float;\r
 {$endif}\r


@@ -105,9 +114,7 @@ var
 \r
 implementation\r
 \r
 \r
 implementation\r
 \r

-{$ifdef fpc}\r
-  {$mode delphi}\r
-{$endif}\r
+\r

 \r
 uses\r
   {$ifdef UNIX}\r
 \r
 uses\r
   {$ifdef UNIX}\r


@@ -138,7 +145,7 @@ end;
 \r
 function oletounix(t:tdatetime):tunixtimeint;\r
 begin\r
 \r
 function oletounix(t:tdatetime):tunixtimeint;\r
 begin\r

-  result := trunc(oletounixfloat(t));\r
+  result := round(oletounixfloat(t));\r

 end;\r
 \r
 function unixtoole(i:float):tdatetime;\r
 end;\r
 \r
 function unixtoole(i:float):tdatetime;\r


@@ -494,7 +501,7 @@ begin
   mmtime_lastresult := result;\r
 end;\r
 \r
   mmtime_lastresult := result;\r
 end;\r
 \r

-{ free pascals tsystemtime is incomaptible with windows api calls\r
+{ free pascals tsystemtime is incompatible with windows api calls\r

  so we declare it ourselves - plugwash\r
 }\r
 {$ifdef fpc}\r
  so we declare it ourselves - plugwash\r
 }\r
 {$ifdef fpc}\r


@@ -553,12 +560,53 @@ begin
   result := mmqpctimefloat;\r
 end;\r
 \r
   result := mmqpctimefloat;\r
 end;\r
 \r

+\r
+\r
+var\r
+  GetSystemTimePreciseAsFileTime:procedure(var v:tfiletime); stdcall;\r
+  win8inited:boolean;\r
+\r
+procedure initwin8;\r
+var\r
+  dllhandle:thandle;\r
+\r
+begin\r
+  win8inited := true;\r
+  dllhandle := loadlibrary('kernel32.dll');\r
+  if (dllhandle <> 0) then begin\r
+    GetSystemTimePreciseAsFileTime := getprocaddress(dllhandle,'GetSystemTimePreciseAsFileTime');\r
+  end;\r
+end;\r
+\r
+\r
+function unixtimefloat_win8:float;\r
+var\r
+  ft:tfiletime;\r
+  i:int64 absolute ft;\r
+begin\r
+  GetSystemTimePreciseAsFileTime(ft);\r
+  {change from windows 1601-01-01 to unix 1970-01-01.\r
+  use integer math for this, to preserve precision}\r
+  dec(i, 116444736000000000);\r
+  result := (i / 10000000);\r
+end;\r
+\r
+\r
+\r

 function unixtimefloat:float;\r
 const\r
   margin = 0.0012;\r
 var\r
   f,g,h:float;\r
 begin\r
 function unixtimefloat:float;\r
 const\r
   margin = 0.0012;\r
 var\r
   f,g,h:float;\r
 begin\r

+  if not btimenowin8 then begin\r
+    if not win8inited then initwin8;\r
+    if assigned(@GetSystemTimePreciseAsFileTime) then begin\r
+      result := unixtimefloat_win8;\r
+      exit;\r
+    end;  \r
+  end;\r
+\r

   result := monotimefloat+timefloatbias;\r
   f := result-unixtimefloat_systemtime;\r
   if ((f > ticks_freq2+margin) or (f < -margin)) or (timefloatbias = 0) then begin\r
   result := monotimefloat+timefloatbias;\r
   f := result-unixtimefloat_systemtime;\r
   if ((f > ticks_freq2+margin) or (f < -margin)) or (timefloatbias = 0) then begin\r


@@ -723,10 +771,19 @@ begin
 \r
 end;\r
 \r
 \r
 end;\r
 \r

+procedure beginhightimerrate;\r
+begin\r
+  {$ifdef mswindows}timebeginperiod(1);{$endif}\r
+end;\r
+\r
+procedure endhightimerrate;\r
+begin\r
+  {$ifdef mswindows}timeendperiod(1);{$endif}\r
+end;\r

 \r
 procedure init;\r
 begin\r
 \r
 procedure init;\r
 begin\r

-  {$ifdef mswindows}timebeginperiod(1);{$endif} //ensure stable unchanging clock\r
+  {$ifdef btimehighrate}beginhightimerrate;{$endif}\r

   fillchar(mmtime_driftavg,sizeof(mmtime_driftavg),0);\r
   settimebias := 0;\r
   gettimezone;\r
   fillchar(mmtime_driftavg,sizeof(mmtime_driftavg),0);\r
   settimebias := 0;\r
   gettimezone;\r