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_time_sup.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_time_sup.c')
| -rw-r--r-- | erts/emulator/beam/erl_time_sup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c index 4f91d9ad07..29c698e34f 100644 --- a/erts/emulator/beam/erl_time_sup.c +++ b/erts/emulator/beam/erl_time_sup.c @@ -1860,7 +1860,7 @@ void erts_get_now_cpu(Uint* megasec, Uint* sec, Uint* microsec) { SysCpuTime t; SysTimespec tp; - sys_get_proc_cputime(t, tp); + sys_get_cputime(t, tp); *microsec = (Uint)(tp.tv_nsec / 1000); t = (tp.tv_sec / 1000000); *megasec = (Uint)(t % 1000000); |