diff options
| author | Eiichi Tsukata <[email protected]> | 2014-04-23 21:46:21 +0900 |
|---|---|---|
| committer | Eiichi Tsukata <[email protected]> | 2014-04-28 14:57:43 +0900 |
| commit | e492b43c3e4366e865e5f1c34d0834df2a91d490 (patch) | |
| tree | a362d082e4f037d7c49f93e40363d31e821cab4f /erts/emulator | |
| parent | 07b8f441ca711f9812fad9e9115bab3c3aa92f79 (diff) | |
| download | otp-e492b43c3e4366e865e5f1c34d0834df2a91d490.tar.gz otp-e492b43c3e4366e865e5f1c34d0834df2a91d490.tar.bz2 otp-e492b43c3e4366e865e5f1c34d0834df2a91d490.zip | |
Add erlang:system_info(tolerant_timeofday)
Add erlang:system_info(tolerant_timeofday), an API to check whether
compensation for sudden changes of system time is enabled or not.
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. |