diff options
| author | Lukas Larsson <[email protected]> | 2013-09-30 14:16:05 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2013-09-30 14:16:05 +0200 |
| commit | c5459f9ba0e8b3568a34788bfd596f5f6be9fca2 (patch) | |
| tree | 89afe690217fb991bd26b4ae6fba5939d46adf86 /erts/preloaded | |
| parent | 0f430abcb189988a7faf55386557b2b74afa6f56 (diff) | |
| parent | 0d18c06a55bcde2af8cff12fe49093fffd32466c (diff) | |
| download | otp-c5459f9ba0e8b3568a34788bfd596f5f6be9fca2.tar.gz otp-c5459f9ba0e8b3568a34788bfd596f5f6be9fca2.tar.bz2 otp-c5459f9ba0e8b3568a34788bfd596f5f6be9fca2.zip | |
Merge branch 'sv/system_info_max_ets' into maint
OTP-11362
* sv/system_info_max_ets:
Update preloaded
add system_info(ets_limit)
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 94152 -> 94156 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex 9da4f3cd00..f1791200e0 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 a969ef91dc..d40ee7c59a 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -2099,13 +2099,14 @@ tuple_to_list(_Tuple) -> (creation) -> integer(); (debug_compiled) -> boolean(); (dist) -> binary(); + (dist_buf_busy_limit) -> non_neg_integer(); (dist_ctrl) -> {Node :: node(), ControllingEntity :: port() | pid()}; (driver_version) -> string(); (dynamic_trace) -> none | dtrace | systemtap; (dynamic_trace_probes) -> boolean(); (elib_malloc) -> false; - (dist_buf_busy_limit) -> non_neg_integer(); + (ets_limit) -> pos_integer(); (fullsweep_after) -> {fullsweep_after, non_neg_integer()}; (garbage_collection) -> [{atom(), integer()}]; (heap_sizes) -> [non_neg_integer()]; |