aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-06-03 14:19:20 +0200
committerRickard Green <[email protected]>2013-06-04 11:34:51 +0200
commit0a7f84365504a86ee622accdef080ad1b6f9ab45 (patch)
tree617b5dfe5e48dff853dc9b9182233992233bfbd3 /erts/preloaded
parent32a73196379a8c3e6083104e2d235f35b5bcbbbf (diff)
downloadotp-0a7f84365504a86ee622accdef080ad1b6f9ab45.tar.gz
otp-0a7f84365504a86ee622accdef080ad1b6f9ab45.tar.bz2
otp-0a7f84365504a86ee622accdef080ad1b6f9ab45.zip
erts: Carrier pool information in allocator information
That is, include information about carrier pool in result returned from erlang:system_info({allocator,allocator_sizes, _}).
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/erlang.beambin93976 -> 94140 bytes
-rw-r--r--erts/preloaded/src/erlang.erl5
2 files changed, 5 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam
index cfbe777633..947fbe7c24 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 27dfeac4d6..a8a4425b63 100644
--- a/erts/preloaded/src/erlang.erl
+++ b/erts/preloaded/src/erlang.erl
@@ -3282,10 +3282,15 @@ get_blocks_size([{blocks_size, Sz, _, _} | Rest], Acc) ->
get_blocks_size(Rest, Acc+Sz);
get_blocks_size([{_, _, _, _} | Rest], Acc) ->
get_blocks_size(Rest, Acc);
+get_blocks_size([{blocks_size, Sz} | Rest], Acc) ->
+ get_blocks_size(Rest, Acc+Sz);
+get_blocks_size([{_, _} | Rest], Acc) ->
+ get_blocks_size(Rest, Acc);
get_blocks_size([], Acc) ->
Acc.
blocks_size([{Carriers, SizeList} | Rest], Acc) when Carriers == mbcs;
+ Carriers == mbcs_pool;
Carriers == sbcs ->
blocks_size(Rest, get_blocks_size(SizeList, Acc));
blocks_size([_ | Rest], Acc) ->