make taddrint on i386 unsigned if possible

[lcore.git] / btime.pas

diff --git a/btime.pas b/btime.pas
index a0bfc5eaa012fe9e030565bf82150ce35a95c8e4..8826a4da4afd1b315060d246d172d58a91dcc13e 100644 (file)
--- a/btime.pas
+++ b/btime.pas
@@ -121,11 +121,10 @@ uses
     {$ifdef VER1_0}\r
       linux,\r
     {$else}\r
     {$ifdef VER1_0}\r
       linux,\r
     {$else}\r

+      {$ifdef linux}linux,{$endif} //for clock_gettime\r
+      {$ifdef freebsd}freebsd,{$endif} //for clock_gettime\r

       baseunix,unix,unixutil,sockets, {unixutil and sockets needed by unixstuff.inc on some compiler versions}\r
     {$endif}\r
       baseunix,unix,unixutil,sockets, {unixutil and sockets needed by unixstuff.inc on some compiler versions}\r
     {$endif}\r

-    {$ifdef linux}\r
-      dl,\r
-    {$endif}\r

   {$else}\r
     windows,unitsettc,mmsystem,\r
   {$endif}\r
   {$else}\r
     windows,unitsettc,mmsystem,\r
   {$endif}\r


@@ -181,49 +180,32 @@ begin
   gettimeofday(tv);\r
   sec := tv.tv_sec;\r
   {$ifndef cpu64}\r
   gettimeofday(tv);\r
   sec := tv.tv_sec;\r
   {$ifndef cpu64}\r

-  if (sec < 0) then inc(sec,$100000000); //tv_sec is 32 bits\r
+  if (sec < -1) then inc(sec,$100000000); //tv_sec is 32 bits. allow -1 for invalid result\r

   {$endif}\r
   result := sec+(tv.tv_usec/1000000);\r
 end;\r
 \r
   {$endif}\r
   result := sec+(tv.tv_usec/1000000);\r
 end;\r
 \r

-{$ifdef linux}\r
-  {$define monotimefloat_implemented}\r
-  const\r
-    CLOCK_MONOTONIC = 1;\r
-  type \r
-    ptimeval = ^ttimeval;\r
-    tclock_gettime = function(clk_id: integer; tp: ptimeval): integer; cdecl;\r
+{$ifdef linux}{$define have_clock_gettime}{$endif}\r
+{$ifdef freebsd}{$define have_clock_gettime}{$endif}\r

 \r
 \r

-  var\r
-    librt_handle:pointer;\r
-    librt_inited:boolean;\r
-    clock_gettime: tclock_gettime;\r
+{$ifdef have_clock_gettime}\r
+  {$define monotimefloat_implemented}\r

 \r
   function monotimefloat:float;\r
   var\r
 \r
   function monotimefloat:float;\r
   var\r

-    ts: ttimeval;\r
+    ts: ttimespec;\r

   begin\r
   begin\r

-    if not librt_inited then begin\r
-      librt_inited := true;\r
-      clock_gettime := nil;\r
-      librt_handle := dlopen('librt.so', RTLD_LAZY);\r
-      if assigned(librt_handle) then begin\r
-        clock_gettime := dlsym(librt_handle, 'clock_gettime');\r
-      end;\r
-    end;\r
-    if assigned(clock_gettime) then begin\r
-      if clock_gettime(CLOCK_MONOTONIC, @ts) = 0 then begin\r
-        //note this really returns nanoseconds\r
-        result := ts.tv_sec + ts.tv_usec / 1000000000.0;\r
-        exit;\r
-      end;\r
+    if clock_gettime(CLOCK_MONOTONIC, @ts) = 0 then begin\r
+      //note this really returns nanoseconds\r
+      result := ts.tv_sec + ts.tv_nsec / 1000000000.0;\r
+      exit;\r

     end;\r
     //fallback\r
     result := unixtimefloat;\r
   end;\r
 \r
 \r
     end;\r
     //fallback\r
     result := unixtimefloat;\r
   end;\r
 \r
 \r

-{$endif} {linux}\r
+{$endif}\r

 \r
 {$ifdef darwin} {mac OS X}\r
 {$define monotimefloat_implemented}\r
 \r
 {$ifdef darwin} {mac OS X}\r
 {$define monotimefloat_implemented}\r


@@ -273,7 +255,7 @@ begin
   gettimeofday(tv);\r
   sec := tv.tv_sec;\r
   {$ifndef cpu64}\r
   gettimeofday(tv);\r
   sec := tv.tv_sec;\r
   {$ifndef cpu64}\r

-  if (sec < 0) then inc(sec,$100000000); //tv_sec is 32 bits\r
+  if (sec < -1) then inc(sec,$100000000); //tv_sec is 32 bits. allow -1 for invalid result\r

   {$endif}\r
   result := sec;\r
 end;\r
   {$endif}\r
   result := sec;\r
 end;\r