diff options
| author | Rickard Green <[email protected]> | 2018-04-13 14:40:52 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-04-13 14:40:52 +0200 |
| commit | d7a4f58cc5d5719588aeb209e4e7cf6f71f5de00 (patch) | |
| tree | 10bce30e6da5bc21799a5ad82bdc12689f268ac3 | |
| parent | fa26cb5a3f7550d5779dce7de748bf91a4bc405e (diff) | |
| parent | 81d2981d47a7a28f136959e71dfd17c11a91a79e (diff) | |
| download | otp-d7a4f58cc5d5719588aeb209e4e7cf6f71f5de00.tar.gz otp-d7a4f58cc5d5719588aeb209e4e7cf6f71f5de00.tar.bz2 otp-d7a4f58cc5d5719588aeb209e4e7cf6f71f5de00.zip | |
Merge branch 'rickard/monotonic_time_1_fix/OTP-15008'
* rickard/monotonic_time_1_fix/OTP-15008:
Teach erlang:monotonic_time/1 the perf_counter time unit
| -rw-r--r-- | erts/emulator/beam/erl_time_sup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c index e5bb3cc15f..4f91d9ad07 100644 --- a/erts/emulator/beam/erl_time_sup.c +++ b/erts/emulator/beam/erl_time_sup.c @@ -2204,6 +2204,8 @@ time_unit_conversion(Process *c_p, Eterm term, ErtsMonotonicTime val, ErtsMonoto ERTS_BIF_PREP_RET(ret, make_time_val(c_p, result)); break; #endif + case am_perf_counter: + goto trap_to_erlang_code; default: { Eterm value, native_res; #ifndef ARCH_64 |