aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded/src/erlang.erl
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-03-07 11:24:43 +0100
committerGitHub <[email protected]>2018-03-07 11:24:43 +0100
commit41a22ab0ad052253df06bc76b242ab25faf8804d (patch)
tree7e08fff23ddf26f3e8e7cb99aae833acf752dc11 /erts/preloaded/src/erlang.erl
parent64dc3c39cbd19d6b75e5b74cfdfdd57419d4c455 (diff)
parent3aa27a437b27d2c02357ed28360b67e3005e49d3 (diff)
downloadotp-41a22ab0ad052253df06bc76b242ab25faf8804d.tar.gz
otp-41a22ab0ad052253df06bc76b242ab25faf8804d.tar.bz2
otp-41a22ab0ad052253df06bc76b242ab25faf8804d.zip
Merge pull request #1733 from garazdawi/lukas/erts/cleanup_system_info_docs
Cleanup erlang:system_info docs
Diffstat (limited to 'erts/preloaded/src/erlang.erl')
-rw-r--r--erts/preloaded/src/erlang.erl9
1 files changed, 6 insertions, 3 deletions
diff --git a/erts/preloaded/src/erlang.erl b/erts/preloaded/src/erlang.erl
index d352e11751..370ecdc3f6 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -2563,10 +2563,10 @@ tuple_to_list(_Tuple) ->
Settings :: [{Subsystem :: atom(),
[{Parameter :: atom(),
Value :: term()}]}];
- (alloc_util_allocators) -> [Alloc] when
- Alloc :: atom();
({allocator, Alloc}) -> [_] when %% More or less anything
Alloc :: atom();
+ (alloc_util_allocators) -> [Alloc] when
+ Alloc :: atom();
({allocator_sizes, Alloc}) -> [_] when %% More or less anything
Alloc :: atom();
(atom_count) -> pos_integer();
@@ -2593,6 +2593,7 @@ tuple_to_list(_Tuple) ->
(driver_version) -> string();
(dynamic_trace) -> none | dtrace | systemtap;
(dynamic_trace_probes) -> boolean();
+ (end_time) -> non_neg_integer();
(elib_malloc) -> false;
(eager_check_io) -> boolean();
(ets_limit) -> pos_integer();
@@ -2620,6 +2621,7 @@ tuple_to_list(_Tuple) ->
(otp_release) -> string();
(os_monotonic_time_source) -> [{atom(),term()}];
(os_system_time_source) -> [{atom(),term()}];
+ (port_parallelism) -> boolean();
(port_count) -> non_neg_integer();
(port_limit) -> pos_integer();
(process_count) -> pos_integer();
@@ -2649,7 +2651,8 @@ tuple_to_list(_Tuple) ->
(trace_control_word) -> non_neg_integer();
(update_cpu_info) -> changed | unchanged;
(version) -> string();
- (wordsize | {wordsize, internal} | {wordsize, external}) -> 4 | 8.
+ (wordsize | {wordsize, internal} | {wordsize, external}) -> 4 | 8;
+ (overview) -> boolean().
system_info(_Item) ->
erlang:nif_error(undefined).