madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

luatz/gettime: Use lunix if available
authordaurnimator <quae@daurnimator.com>
Sat, 11 Mar 2017 04:00:32 +0000 (15:00 +1100)
committerdaurnimator <quae@daurnimator.com>
Sat, 11 Mar 2017 04:00:32 +0000 (15:00 +1100)
doc/gettime.md
luatz/gettime.lua

index a31e5a09682f465b46b8d2c16038298da8f0bd9d..355057773d48d2b91ed282e3f635faca37cb2dfb 100644 (file)
@@ -4,9 +4,10 @@ A module to get the current time.
 
 Uses the most precise method available (in order:)
 
-  - Use [ljsyscall](http://www.myriabit.com/ljsyscall/) to access
-         - `clock_gettime(2)` called with `CLOCK_REALTIME`
-         - `gettimeofday(2)`
+  - Use [ljsyscall](http://www.myriabit.com/ljsyscall/) to access `clock_gettime(2)` called with `CLOCK_REALTIME`
+  - [lunix](http://25thandclement.com/~william/projects/lunix.html)'s `unix.clock_gettime()` (Only on non-Apple systems)
+  - Use [ljsyscall](http://www.myriabit.com/ljsyscall/) to access `gettimeofday(2)`
+  - [lunix](http://25thandclement.com/~william/projects/lunix.html)'s `unix.gettimeofday()`
   - [luasocket](http://w3.impa.br/~diego/software/luasocket/)'s `socket.gettime`
   - [Openresty](http://openresty.org/)'s [`ngx.now`](http://wiki.nginx.org/HttpLuaModule#ngx.now)
   - [`os.time`](http://www.lua.org/manual/5.3/manual.html#pdf-os.time)
index b5dec5a5a1ea67c3e25d1e2e6895df65378c8ebe..d3eee802d205d8266355a09f21e6900cda135d27 100644 (file)
@@ -2,27 +2,38 @@ local _M = { }
 
 _M.source , _M.resolution , _M.gettime = (function()
        local has_syscall , syscall = pcall ( require , "syscall" )
-       if has_syscall then
-               if syscall.clock_gettime and syscall.c.CLOCK then
-                       local clock_id = syscall.c.CLOCK.REALTIME
-                       local function timespec_to_number ( timespec )
-                               return tonumber ( timespec.tv_sec ) + tonumber ( timespec.tv_nsec ) * 1e-9
-                       end
-                       return "syscall.clock_gettime(CLOCK_REALTIME)" ,
-                               syscall.clock_getres and timespec_to_number ( syscall.clock_getres ( clock_id ) ) or 1e-9 ,
-                               function ( )
-                                       return timespec_to_number ( syscall.clock_gettime ( clock_id ) )
-                               end
-
-               elseif syscall.gettimeofday then
-                       local function timeval_to_number ( timeval )
-                               return tonumber ( timeval.tv_sec ) + tonumber ( timeval.tv_nsec ) * 1e-6
+       if has_syscall and syscall.clock_gettime and syscall.c.CLOCK then
+               local clock_id = syscall.c.CLOCK.REALTIME
+               local function timespec_to_number ( timespec )
+                       return tonumber ( timespec.tv_sec ) + tonumber ( timespec.tv_nsec ) * 1e-9
+               end
+               return "syscall.clock_gettime(CLOCK_REALTIME)" ,
+                       syscall.clock_getres and timespec_to_number ( syscall.clock_getres ( clock_id ) ) or 1e-9 ,
+                       function ( )
+                               return timespec_to_number ( syscall.clock_gettime ( clock_id ) )
                        end
-                       return "syscall.gettimeofday()" , 1e-6 ,
-                               function ( )
-                                       return timeval_to_number ( syscall.gettimeofday ( ) )
-                               end
+       end
+
+       local has_unix , unix = pcall ( require , "unix" )
+       -- On Apple devices lunix only uses gettimeofday()
+       if has_unix and unix.clock_gettime and unix.uname and unix.uname().sysname ~= "Darwin" then
+               return "unix.clock_gettime(CLOCK_REALTIME)" , 1e-9 , function ( )
+                       return unix.clock_gettime ( )
+               end
+       end
+
+       if has_syscall and syscall.gettimeofday then
+               local function timeval_to_number ( timeval )
+                       return tonumber ( timeval.tv_sec ) + tonumber ( timeval.tv_nsec ) * 1e-6
                end
+               return "syscall.gettimeofday()" , 1e-6 ,
+                       function ( )
+                               return timeval_to_number ( syscall.gettimeofday ( ) )
+                       end
+       end
+
+       if has_unix and unix.gettimeofday then
+               return "unix.gettimeofday()", 1e-6, unix.gettimeofday
        end
 
        local has_socket , socket = pcall ( require , "socket" )