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_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_trace.c')
| -rw-r--r-- | erts/emulator/beam/erl_trace.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/erts/emulator/beam/erl_trace.c b/erts/emulator/beam/erl_trace.c index f074dd8bdb..f4161b14f2 100644 --- a/erts/emulator/beam/erl_trace.c +++ b/erts/emulator/beam/erl_trace.c @@ -625,20 +625,6 @@ erts_get_system_profile(void) { return profile; } - -#ifdef HAVE_ERTS_NOW_CPU -# define GET_NOW(m, s, u) \ -do { \ - if (erts_cpu_timestamp) \ - erts_get_now_cpu(m, s, u); \ - else \ - get_now(m, s, u); \ -} while (0) -#else -# define GET_NOW(m, s, u) do {get_now(m, s, u);} while (0) -#endif - - static void write_sys_msg_to_port(Eterm unused_to, Port* trace_port, |