vieter-v
/
v
2
0
Fork 0
Code Issues Pull Requests Releases Activity

time: use linux high-precision timers on Android as well (#6476)

pull/6480/head
spaceface777 2020-09-25 17:02:02 +02:00 committed by GitHub
parent aa1d5fcbdd
commit b44620d065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vlib/time/time.v
View File

@ -100,7 +100,7 @@ pub fn now() Time {
$if solaris { $if solaris {
return solaris_now() return solaris_now()
} }
$if linux { $if linux || android {
return linux_now() return linux_now()
} }
// defaults to most common feature, the microsecond precision is not available // defaults to most common feature, the microsecond precision is not available
@ -121,7 +121,7 @@ pub fn utc() Time {
$if solaris { $if solaris {
return solaris_utc() return solaris_utc()
} }
$if linux { $if linux || android {
return linux_utc() return linux_utc()
} }
// defaults to most common feature, the microsecond precision is not available // defaults to most common feature, the microsecond precision is not available

27
vlib/time/time_linux.c.v
View File

@ -1,32 +1,5 @@
module time module time
// linux_now returns the local time with high precision for most os:es
// this should be implemented properly with support for leap seconds.
// It uses the realtime clock to get and converts it to local time
[inline]
fn linux_now() Time {
// get the high precision time as UTC realtime clock
// and use the nanoseconds part
mut ts := C.timespec{}
C.clock_gettime(C.CLOCK_REALTIME, &ts)
loc_tm := C.tm{}
C.localtime_r(&ts.tv_sec, &loc_tm)
return convert_ctime(loc_tm, int(ts.tv_nsec/1000))
}
[inline]
fn linux_utc() Time {
// get the high precision time as UTC realtime clock
// and use the nanoseconds part
mut ts := C.timespec{}
C.clock_gettime(C.CLOCK_REALTIME, &ts)
return unix2(int(ts.tv_sec), int(ts.tv_nsec/1000))
}
fn sys_mono_now_darwin() u64 { fn sys_mono_now_darwin() u64 {
return 0 return 0
} }

28
vlib/time/time_nix.c.v
View File

@ -62,7 +62,35 @@ fn vpc_now() u64 {
return u64(ts.tv_sec) * 1_000_000_000 + u64(ts.tv_nsec) return u64(ts.tv_sec) * 1_000_000_000 + u64(ts.tv_nsec)
} }
// The linux_* functions are placed here, since they're used on Android as well
// TODO: should `$if linux {}` be parsed on Android as well? (Android runs under the Linux kernel)
// linux_now returns the local time with high precision for most os:es
// this should be implemented properly with support for leap seconds.
// It uses the realtime clock to get and converts it to local time
[inline]
fn linux_now() Time {
// get the high precision time as UTC realtime clock
// and use the nanoseconds part
mut ts := C.timespec{}
C.clock_gettime(C.CLOCK_REALTIME, &ts)
loc_tm := C.tm{}
C.localtime_r(&ts.tv_sec, &loc_tm)
return convert_ctime(loc_tm, int(ts.tv_nsec/1000))
}
[inline]
fn linux_utc() Time {
// get the high precision time as UTC realtime clock
// and use the nanoseconds part
mut ts := C.timespec{}
C.clock_gettime(C.CLOCK_REALTIME, &ts)
return unix2(int(ts.tv_sec), int(ts.tv_nsec/1000))
}
// dummy to compile with all compilers // dummy to compile with all compilers
pub fn win_now() Time { pub fn win_now() Time {