aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-01-23 14:52:03 +0100
committerRickard Green <[email protected]>2013-01-23 14:52:03 +0100
commit6141db8f76d310f648cc8e278cf9b62bf1417ca8 (patch)
tree4e8e34ff9c53b9ac2650dfb993f2af159acd53f0 /erts/preloaded
parentcc8285ed57ad46fcbbbfb333535ff472dd57ec27 (diff)
parente3373f0602282040ae7a75b5b7ebbdcae2789c17 (diff)
downloadotp-6141db8f76d310f648cc8e278cf9b62bf1417ca8.tar.gz
otp-6141db8f76d310f648cc8e278cf9b62bf1417ca8.tar.bz2
otp-6141db8f76d310f648cc8e278cf9b62bf1417ca8.zip
Merge branch 'rickard/r16/port-optimizations/OTP-10336'
* rickard/r16/port-optimizations/OTP-10336: Bump reductions also for immediate driver calls Add 'port_count' and 'port_limit' to system_info/1 spec Fix documentation Replace use of deprecated functions in test cases Replace use of driver_send_term() with erl_drv_send_term() Conflicts: erts/preloaded/ebin/erlang.beam
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/erlang.beambin92756 -> 92840 bytes
-rw-r--r--erts/preloaded/src/erlang.erl2
2 files changed, 2 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index bea586b11c..af7adc2d44 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 061db72dd8..e966ac5296 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2057,6 +2057,8 @@ tuple_to_list(_Tuple) ->
(multi_scheduling) -> disabled | blocked | enabled;
(multi_scheduling_blockers) -> [PID :: pid()];
(otp_release) -> string();
+ (port_count) -> non_neg_integer();
+ (port_limit) -> pos_integer();
(process_count) -> pos_integer();
(process_limit) -> pos_integer();
(procs) -> binary();