diff options
| author | Lukas Larsson <[email protected]> | 2018-05-21 16:56:41 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-05-21 16:56:41 +0200 |
| commit | 29871fb6086b535104b10703dd524781e87e0800 (patch) | |
| tree | 1436b47255d78be4f1b35a8364b5eec024d863d9 /erts/emulator/beam/erl_bif_trace.c | |
| parent | 9cc697fe2cda12ed2d32fb134ed5584f248f9377 (diff) | |
| parent | d5dc5584884488c8fcb5710997a14c2c418692f3 (diff) | |
| download | otp-29871fb6086b535104b10703dd524781e87e0800.tar.gz otp-29871fb6086b535104b10703dd524781e87e0800.tar.bz2 otp-29871fb6086b535104b10703dd524781e87e0800.zip | |
Merge branch 'lukas/erts/cpu_time_thread/OTP-15090'
* lukas/erts/cpu_time_thread/OTP-15090:
erts: Make cpu_timestamp use per thread on Linux
Diffstat (limited to 'erts/emulator/beam/erl_bif_trace.c')
| -rw-r--r-- | erts/emulator/beam/erl_bif_trace.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_bif_trace.c b/erts/emulator/beam/erl_bif_trace.c index f9d351e69e..9861483bf0 100644 --- a/erts/emulator/beam/erl_bif_trace.c +++ b/erts/emulator/beam/erl_bif_trace.c @@ -643,12 +643,12 @@ Eterm erts_internal_trace_3(BIF_ALIST_3) SysTimespec tp; int i; - if (sys_get_proc_cputime(start, tp) < 0) + if (sys_get_cputime(start, tp) < 0) goto error; start = ((SysCpuTime)tp.tv_sec * 1000000000LL) + (SysCpuTime)tp.tv_nsec; for (i = 0; i < 100; i++) - sys_get_proc_cputime(stop, tp); + sys_get_cputime(stop, tp); stop = ((SysCpuTime)tp.tv_sec * 1000000000LL) + (SysCpuTime)tp.tv_nsec; if (start == 0) goto error; |