aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator/beam
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-04-10 15:06:32 +0200
committerRickard Green <[email protected]>2018-04-10 15:06:32 +0200
commit81d2981d47a7a28f136959e71dfd17c11a91a79e (patch)
treeb85f140b5d2cac5f23c79c9c271b2fd9f5ce521e /erts/emulator/beam
parent3b7a6ffddc819bf305353a593904cea9e932e7dc (diff)
downloadotp-81d2981d47a7a28f136959e71dfd17c11a91a79e.tar.gz
otp-81d2981d47a7a28f136959e71dfd17c11a91a79e.tar.bz2
otp-81d2981d47a7a28f136959e71dfd17c11a91a79e.zip
Teach erlang:monotonic_time/1 the perf_counter time unit
Diffstat (limited to 'erts/emulator/beam')
-rw-r--r--erts/emulator/beam/erl_time_sup.c2
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 9e37106b88..b9d19eb7d0 100644
--- a/erts/emulator/beam/erl_time_sup.c
+++ b/erts/emulator/beam/erl_time_sup.c
@@ -2155,6 +2155,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