aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-09-25 17:05:48 +0200
committerRickard Green <[email protected]>2014-09-25 17:05:48 +0200
commit3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61 (patch)
tree1bee4fc91742e3291792caacc61d20a67a80300d /erts/preloaded
parent743ed31108ee555db18d9833186865e85e34333e (diff)
parent6084a42a24fca52a5de2bc487c0cd2be46dcc21f (diff)
downloadotp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.tar.gz
otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.tar.bz2
otp-3e4491cf98d6ec0ff8b10dfdfac8d8c0b7031e61.zip
Merge branch 'rickard/eager-check-io/OTP-12117' into rickard/maint-17/eager-check-io/OTP-12117
* rickard/eager-check-io/OTP-12117: Introduce support for eager check I/O scheduling Conflicts: erts/emulator/beam/erl_bif_info.c erts/emulator/beam/erl_init.c erts/emulator/beam/erl_process.c erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/erlang.beambin97908 -> 97972 bytes
-rw-r--r--erts/preloaded/src/erlang.erl1
2 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index c5cf4b459f..1893dd84ac 100644
--- a/erts/preloaded/ebin/erlang.beam
+++ b/erts/preloaded/ebin/erlang.beam
Binary files differ
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index 98d7a942a6..4ba623d921 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2233,6 +2233,7 @@ tuple_to_list(_Tuple) ->
(dynamic_trace) -> none | dtrace | systemtap;
(dynamic_trace_probes) -> boolean();
(elib_malloc) -> false;
+ (eager_check_io) -> boolean();
(ets_limit) -> pos_integer();
(fullsweep_after) -> {fullsweep_after, non_neg_integer()};
(garbage_collection) -> [{atom(), integer()}];