aboutsummaryrefslogtreecommitdiffstats
path: root/erts/emulator
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2014-06-05 11:05:13 +0200
committerLukas Larsson <[email protected]>2014-06-05 11:05:13 +0200
commitd30fd47e2e886094d72d8dcb00f1392cabeda23f (patch)
treec4b0234480e0783a1a3bf74025d71b8f0edd73c6 /erts/emulator
parenta219ce0b48b88bd74ed80835982e3f6053bcc6c6 (diff)
parent5eb7105fb6f479ed50db5435d510aae0306b8d46 (diff)
downloadotp-d30fd47e2e886094d72d8dcb00f1392cabeda23f.tar.gz
otp-d30fd47e2e886094d72d8dcb00f1392cabeda23f.tar.bz2
otp-d30fd47e2e886094d72d8dcb00f1392cabeda23f.zip
Merge branch 'maint'
* maint: Add erlang:system_info(tolerant_timeofday)
Diffstat (limited to 'erts/emulator')
-rwxr-xr-xerts/emulator/beam/erl_bif_info.c5
-rw-r--r--erts/emulator/test/system_info_SUITE.erl1
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.