diff options
| author | Rickard Green <[email protected]> | 2015-03-26 22:46:29 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2015-05-06 15:58:32 +0200 |
| commit | edce22eb43c40359ccbd0924412cf13692744779 (patch) | |
| tree | 4ecb3fd82be20f5e1bfa49e777310ca04c2d8ab8 /erts/emulator/sys/unix/erl_unix_sys.h | |
| parent | bf3b377220f2531b9b101f32222067beb3ea750b (diff) | |
| download | otp-edce22eb43c40359ccbd0924412cf13692744779.tar.gz otp-edce22eb43c40359ccbd0924412cf13692744779.tar.bz2 otp-edce22eb43c40359ccbd0924412cf13692744779.zip | |
Misc time improvements
- Possibility to chose different clock sources
- Improved mach clock usage
- Improved linux clock_gettime() usage
- ...
Diffstat (limited to 'erts/emulator/sys/unix/erl_unix_sys.h')
| -rw-r--r-- | erts/emulator/sys/unix/erl_unix_sys.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h index 8fc5a3ca49..29a65f883c 100644 --- a/erts/emulator/sys/unix/erl_unix_sys.h +++ b/erts/emulator/sys/unix/erl_unix_sys.h @@ -177,10 +177,10 @@ typedef ErtsMonotonicTime ErtsSystemTime; /* * OS monotonic time and OS system time */ - #undef ERTS_OS_TIMES_INLINE_FUNC_PTR_CALL__ -#if defined(OS_SYSTEM_TIME_USING_CLOCK_GETTIME) +#if defined(OS_SYSTEM_TIME_USING_CLOCK_GETTIME) \ + && defined(OS_MONOTONIC_TIME_USING_CLOCK_GETTIME) # if defined(__linux__) # define ERTS_OS_TIMES_INLINE_FUNC_PTR_CALL__ 1 # endif @@ -191,13 +191,11 @@ ErtsSystemTime erts_os_system_time(void); #undef ERTS_HAVE_OS_MONOTONIC_TIME_SUPPORT #undef ERTS_COMPILE_TIME_MONOTONIC_TIME_UNIT #undef ERTS_OS_MONOTONIC_INLINE_FUNC_PTR_CALL__ -#undef ERTS_HAVE_CORRECTED_OS_MONOTONIC #if defined(OS_MONOTONIC_TIME_USING_CLOCK_GETTIME) # define ERTS_HAVE_OS_MONOTONIC_TIME_SUPPORT 1 # define ERTS_COMPILE_TIME_MONOTONIC_TIME_UNIT (1000*1000*1000) # if defined(__linux__) -# define ERTS_HAVE_CORRECTED_OS_MONOTONIC 1 # define ERTS_OS_MONOTONIC_INLINE_FUNC_PTR_CALL__ 1 # endif #elif defined(OS_MONOTONIC_TIME_USING_MACH_CLOCK_GET_TIME) |