remove threadtime and rename walltime to realtime and processtime to cputime

Author: vchuravy

src/timers/darwin.jl

@@ -31,48 +31,13 @@ end
     return user+kernel
 end
 
-struct time_value_t
-    seconds::Cint
-    microseconds::Cint
+@inline function realtime()
+    Float64(Base.time_ns())
 end
 
-struct thread_basic_info
-    user_time::time_value_t
-    system_time::time_value_t
-    cpu_usage::Cint
-    policy::Cint
-    run_state::Cint
-    flags::Cint
-    suspend_count::Cint
-    sleep_time::Cint
-end
-
-@inline function maketime(info::thread_basic_info)
-    user   = info.user_time.seconds   * 1e9 + info.user_time.microseconds   * 1e3
-    system = info.system_time.seconds * 1e9 + info.system_time.microseconds * 1e3
-    return user+system
-end
-
-@inline function walltime
-    Base.time_ns()
-end
-
-@inline function processtime()
+@inline function cputime()
     ru = Ref{rusage}()
     err = ccall(:getrusage, Cint, (Cint, Ref{rusage}), RUSAGE_SELF, ru)
     # TODO error check
     return maketime(ru[])
 end
-
-const THREAD_BASIC_INFO_COUNT = (sizeof(thread_basic_info) ÷ sizeof(Int))
-
-@inline function threadtime()
-    #mach_msg_type_number_t count = THREAD_BASIC_INFO_COUNT;
-    #thread_basic_info_data_t info;
-    #mach_port_t thread = pthread_mach_thread_np(pthread_self());
-    #if (thread_info(thread, THREAD_BASIC_INFO, (thread_info_t)&info, &count) ==
-    #    KERN_SUCCESS) {
-    #  return MakeTime(info);
-    #}
-    error("Thread time not implemented on OSX")
-end

src/timers/timers.jl

@@ -5,31 +5,22 @@ Based upon https://github.com/google/benchmark
 module Timers
 
 """
-    walltime()
+    realtime()
 
 Monotonic runtime counter
 
 Returns time in ns as Float64.
 """
-function walltime end
+function realtime end
 
 """
-    processtime()
+    cputime()
 
 Process specific CPU time clock.
 
 Returns time in ns as Float64.
 """
-function processtime end
-
-"""
-    threadtime()
-
-Thread specific CPU time clock.
-
-Returns time in ns as Float64.
-"""
-function threadtime end
+function cputime end
 
 function _applever()
     return VersionNumber(readchomp(`sw_vers -productVersion`))

src/timers/unix.jl

@@ -10,15 +10,12 @@ maketime(ts) = ts.tv_sec * 1e9 + ts.tv_nsec
 if is_linux()
     const CLOCK_MONOTONIC          = Cint(1)
     const CLOCK_PROCESS_CPUTIME_ID = Cint(2)
-    const CLOCK_THREAD_CPUTIME_ID  = Cint(3)
 elseif Sys.KERNEL == :FreeBSD # atleast on FreeBSD 11.1
     const CLOCK_MONOTONIC          = Cint(4)
     const CLOCK_PROCESS_CPUTIME_ID = Cint(14)
-    const CLOCK_THREAD_CPUTIME_ID  = Cint(15)
 elseif is_apple() # Version 10.12 required
     const CLOCK_MONOTONIC          = Cint(6)
     const CLOCK_PROCESS_CPUTIME_ID = Cint(12)
-    const CLOCK_THREAD_CPUTIME_ID  = Cint(16)
 else
     error("""
           BenchmarkTools doesn't currently support your system.
@@ -32,14 +29,10 @@ end
     return ts[]
 end
 
-@inline function walltime()
+@inline function realtime()
     maketime(clock_gettime(CLOCK_MONOTONIC))
 end
 
-@inline function processtime()
+@inline function cputime()
     maketime(clock_gettime(CLOCK_PROCESS_CPUTIME_ID))
 end
-
-@inline function threadtime()
-    maketime(clock_gettime(CLOCK_THREAD_CPUTIME_ID))
-end

src/timers/windows.jl

@@ -16,13 +16,13 @@ const HANDLE = Ptr{Void}
     (kernel + user) * 1e2
 end
 
-@inline function walltime()
+@inline function realtime()
     # counter = Ref{UInt64}()
     # err = ccall(:QueryPerformanceCounter, Cint, (Ref{UInt64},) )
     return Float64(Base.time_ns())
 end
 
-@inline function processtime()
+@inline function cputime()
     proc = ccall(:GetCurrentProcess, HANDLE, ())
     creation_time = Ref{FileTime}()
     exit_time = Ref{FileTime}()
@@ -34,16 +34,3 @@ end
     # TODO: Error handling
     return maketime(kernel_time, user_time)
 end
-
-@inline function threadtime()
-    thread = ccall(:GetCurrentThread, HANDLE, ())
-    creation_time = Ref{FileTime}()
-    exit_time = Ref{FileTime}()
-    kernel_time = Ref{FileTime}()
-    user_time = Ref{FileTime}()
-
-    err = ccall(:GetThreadTimes, Cint, (HANDLE, Ref{FileTime}, Ref{FileTime}, Ref{FileTime}, Ref{FileTime}), 
-                                thread, creation_time, exit_time, kernel_time, user_time)
-    # TODO: Error handling
-    return maketime(kernel_time, user_time)
-end