diff options
| author | Lukas Larsson <[email protected]> | 2014-06-05 11:04:57 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2014-06-05 11:04:57 +0200 |
| commit | 5eb7105fb6f479ed50db5435d510aae0306b8d46 (patch) | |
| tree | 2420afdc8535e091a9aec80ed5d201634e7356b8 /erts/emulator | |
| parent | dd764d2a8070111f026aef0d21be1e2a19ad988f (diff) | |
| parent | e492b43c3e4366e865e5f1c34d0834df2a91d490 (diff) | |
| download | otp-5eb7105fb6f479ed50db5435d510aae0306b8d46.tar.gz otp-5eb7105fb6f479ed50db5435d510aae0306b8d46.tar.bz2 otp-5eb7105fb6f479ed50db5435d510aae0306b8d46.zip | |
Merge branch 'etsukata/system_info_tolerant_timeofday/OTP-11970' into maint
* etsukata/system_info_tolerant_timeofday/OTP-11970:
Add erlang:system_info(tolerant_timeofday)
Diffstat (limited to 'erts/emulator')
| -rwxr-xr-x | erts/emulator/beam/erl_bif_info.c | 5 | ||||
| -rw-r--r-- | erts/emulator/test/system_info_SUITE.erl | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c index 2adba9b240..4d5e55aaf5 100755 --- a/erts/emulator/beam/erl_bif_info.c +++ b/erts/emulator/beam/erl_bif_info.c @@ -2691,6 +2691,11 @@ BIF_RETTYPE system_info_1(BIF_ALIST_1) else if (ERTS_IS_ATOM_STR("ets_limit",BIF_ARG_1)) { BIF_RET(make_small(erts_db_get_max_tabs())); } + else if (ERTS_IS_ATOM_STR("tolerant_timeofday",BIF_ARG_1)) { + BIF_RET(erts_disable_tolerant_timeofday + ? am_disabled + : am_enabled); + } BIF_ERROR(BIF_P, BADARG); } diff --git a/erts/emulator/test/system_info_SUITE.erl b/erts/emulator/test/system_info_SUITE.erl index ceb4afb5cf..f959714be7 100644 --- a/erts/emulator/test/system_info_SUITE.erl +++ b/erts/emulator/test/system_info_SUITE.erl @@ -155,6 +155,7 @@ misc_smoke_tests(Config) when is_list(Config) -> ?line true = is_binary(erlang:system_info(loaded)), ?line true = is_binary(erlang:system_info(dist)), ?line ok = try erlang:system_info({cpu_topology,erts_get_cpu_topology_error_case}), fail catch error:badarg -> ok end, + true = lists:member(erlang:system_info(tolerant_timeofday), [enabled, disabled]), ?line ok. |