diff options
| author | Rickard Green <[email protected]> | 2014-10-23 10:41:49 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-10-23 10:41:49 +0200 |
| commit | e97f9bc1672cb2d2c07d4133030528b43b26532c (patch) | |
| tree | cd519abf66793978459558f38f64e554c31432db /erts/preloaded | |
| parent | ff3fae223431a9cb0d2a2852a07f9447960c92ed (diff) | |
| parent | 404c44d58058da8cfead5dd310fcb24bf3e8d344 (diff) | |
| download | otp-e97f9bc1672cb2d2c07d4133030528b43b26532c.tar.gz otp-e97f9bc1672cb2d2c07d4133030528b43b26532c.tar.bz2 otp-e97f9bc1672cb2d2c07d4133030528b43b26532c.zip | |
Merge branch 'rickard/maint-17/eager-check-io/OTP-12117' into maint
* rickard/maint-17/eager-check-io/OTP-12117:
No eager check I/O on OSE
Introduce support for eager check I/O scheduling
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 97908 -> 97972 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex c5cf4b459f..1893dd84ac 100644 --- a/erts/preloaded/ebin/erlang.beam +++ b/erts/preloaded/ebin/erlang.beam 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()}]; |