diff options
| author | Rickard Green <rickard@erlang.org> | 2022-08-11 00:51:47 +0200 |
|---|---|---|
| committer | Rickard Green <rickard@erlang.org> | 2022-08-11 01:26:38 +0200 |
| commit | 1867cff4efc3652b31b051ec84ce667b6aece3a1 (patch) | |
| tree | 4ac579ebf07dc68fff99dd9bab1f43a85cd78835 /erts/emulator/beam/erl_time_sup.c | |
| parent | 6d5a5f31c36bbdaad21585d25974177bd1b75e66 (diff) | |
| download | erlang-1867cff4efc3652b31b051ec84ce667b6aece3a1.tar.gz | |
[erts] Accept native time unit where documented as supported
Fixes erlang:monotonic_time(native), erlang:system_time(native),
erlang:time_offset(native), and os:system_time(native).
Diffstat (limited to 'erts/emulator/beam/erl_time_sup.c')
| -rw-r--r-- | erts/emulator/beam/erl_time_sup.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_time_sup.c b/erts/emulator/beam/erl_time_sup.c index d26ea19494..56a8fa369a 100644 --- a/erts/emulator/beam/erl_time_sup.c +++ b/erts/emulator/beam/erl_time_sup.c @@ -2178,6 +2178,10 @@ time_unit_conversion(Process *c_p, Eterm term, ErtsMonotonicTime val, ErtsMonoto /* Convert to common user specified time units */ switch (term) { + case am_native: + result = val + muloff*ERTS_MONOTONIC_OFFSET_NATIVE; + ERTS_BIF_PREP_RET(ret, make_time_val(c_p, result)); + break; case am_second: case am_seconds: case make_small(1): |