diff options
| author | Lukas Larsson <[email protected]> | 2014-12-12 15:34:52 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-12-12 15:34:52 +0100 |
| commit | d5b67726739befc7d0ab9a9282494ae1c28903d7 (patch) | |
| tree | fb2fa29fd1611ef395626342b85b81e6181df547 /erts/emulator/sys | |
| parent | 1b6f362e555e508d3d40d907b10061e457deafb5 (diff) | |
| parent | 6e3057ddddb77835664f5264a7da62452dc3d9c1 (diff) | |
| download | otp-d5b67726739befc7d0ab9a9282494ae1c28903d7.tar.gz otp-d5b67726739befc7d0ab9a9282494ae1c28903d7.tar.bz2 otp-d5b67726739befc7d0ab9a9282494ae1c28903d7.zip | |
Merge branch 'lukas/erts/cpu_timestamp_linux/OTP-12366'
* lukas/erts/cpu_timestamp_linux/OTP-12366:
erts: Allow cpu_timestamp tracing for Linux
Diffstat (limited to 'erts/emulator/sys')
| -rw-r--r-- | erts/emulator/sys/unix/erl_unix_sys.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/sys/unix/erl_unix_sys.h b/erts/emulator/sys/unix/erl_unix_sys.h index 26ed2fb558..b6bca5c0f4 100644 --- a/erts/emulator/sys/unix/erl_unix_sys.h +++ b/erts/emulator/sys/unix/erl_unix_sys.h @@ -188,7 +188,7 @@ typedef hrtime_t SysHrTime; #endif /* GETHRTIME_WITH_CLOCK_GETTIME */ #endif /* HAVE_GETHRTIME */ -#if (defined(HAVE_GETHRVTIME) || defined(HAVE_CLOCK_GETTIME)) +#if (defined(HAVE_GETHRVTIME) || defined(HAVE_CLOCK_GETTIME_CPU_TIME)) typedef long long SysCpuTime; typedef struct timespec SysTimespec; @@ -200,7 +200,7 @@ typedef struct timespec SysTimespec; int sys_start_hrvtime(void); int sys_stop_hrvtime(void); -#elif defined(HAVE_CLOCK_GETTIME) +#elif defined(HAVE_CLOCK_GETTIME_CPU_TIME) #define sys_clock_gettime(cid,tp) clock_gettime((cid),&(tp)) #define sys_get_proc_cputime(t,tp) sys_clock_gettime(CLOCK_PROCESS_CPUTIME_ID,(tp)) |