diff options
| author | Rickard Green <[email protected]> | 2015-03-26 12:16:16 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-03-26 12:16:16 +0100 |
| commit | 29ed0766068fbf960651c3f4d1f73281304dd546 (patch) | |
| tree | 70c9f75ba131f21c3fda6d3684eee070bc027668 /erts/emulator/sys/unix | |
| parent | 26eba549b2adc29bab37a5edd7aa96b42399936e (diff) | |
| parent | 2e016f6cde89bf471269c89f0fd2bb40422ce204 (diff) | |
| download | otp-29ed0766068fbf960651c3f4d1f73281304dd546.tar.gz otp-29ed0766068fbf960651c3f4d1f73281304dd546.tar.bz2 otp-29ed0766068fbf960651c3f4d1f73281304dd546.zip | |
Merge branch 'rickard/time_api/OTP-11997'
* rickard/time_api/OTP-11997:
Misc fixes
Conflicts:
erts/preloaded/ebin/erlang.beam
erts/preloaded/ebin/erts_internal.beam
Diffstat (limited to 'erts/emulator/sys/unix')
| -rw-r--r-- | erts/emulator/sys/unix/sys_time.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/erts/emulator/sys/unix/sys_time.c b/erts/emulator/sys/unix/sys_time.c index ea021a27cf..d535457977 100644 --- a/erts/emulator/sys/unix/sys_time.c +++ b/erts/emulator/sys/unix/sys_time.c @@ -410,11 +410,7 @@ erts_os_system_time(void) stime = (ErtsSystemTime) posix_clock_gettime(WALL_CLOCK_ID, WALL_CLOCK_ID_STR); -#if defined(OS_MONOTONIC_TIME_USING_CLOCK_GETTIME) - return stime; -#else return adj_stime_time_unit(stime, (Uint32) 1000*1000*1000); -#endif } #endif /* defined(OS_SYSTEM_TIME_USING_CLOCK_GETTIME) */ @@ -516,8 +512,7 @@ ErtsMonotonicTime erts_os_monotonic_time(void) #if defined(OS_SYSTEM_TIME_USING_CLOCK_GETTIME) -static void erts_os_times(ErtsMonotonicTime *mtimep, - ErtsSystemTime *stimep) +void erts_os_times(ErtsMonotonicTime *mtimep, ErtsSystemTime *stimep) { posix_clock_gettime_times(mtimep, stimep); } @@ -627,11 +622,7 @@ erts_os_system_time(void) ErtsSystemTime stime; stime = (ErtsSystemTime) mach_clock_gettime(WALL_CLOCK_ID, WALL_CLOCK_ID_STR); -#if defined(OS_MONOTONIC_TIME_USING_MACH_CLOCK_GET_TIME) - return stime; -#else return adj_stime_time_unit(stime, (Uint32) 1000*1000*1000); -#endif } #endif /* defined(OS_SYSTEM_TIME_USING_MACH_CLOCK_GET_TIME) */ |