aboutsummaryrefslogtreecommitdiffstats
path: root/lib/runtime_tools/src
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-11-25 09:05:20 +0100
committerRickard Green <[email protected]>2013-11-25 09:05:20 +0100
commite6b3e1499677fa0aff83e0416ea9a58ffab95210 (patch)
tree9be1684ea3e10c2afbc3176aa0a903ff88a5e10a /lib/runtime_tools/src
parentbfb832589ea4d5c60db202459beab102768341ff (diff)
parent6cd261deb5fec413eb196b620a4618cfa0781458 (diff)
downloadotp-e6b3e1499677fa0aff83e0416ea9a58ffab95210.tar.gz
otp-e6b3e1499677fa0aff83e0416ea9a58ffab95210.tar.bz2
otp-e6b3e1499677fa0aff83e0416ea9a58ffab95210.zip
Merge branch 'rickard/supercarrier-fix/OTP-11149' into maint
* rickard/supercarrier-fix/OTP-11149: Fix observer retrieval of alloc info Fix documentation of the +MMsco switch Replace the +MMscmgc switch with +MMscrfsd Add switch for disabling sys_alloc carriers Add support for locking mappings to physical memory
Diffstat (limited to 'lib/runtime_tools/src')
-rw-r--r--lib/runtime_tools/src/observer_backend.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/runtime_tools/src/observer_backend.erl b/lib/runtime_tools/src/observer_backend.erl
index 670e216d97..202129c61a 100644
--- a/lib/runtime_tools/src/observer_backend.erl
+++ b/lib/runtime_tools/src/observer_backend.erl
@@ -77,8 +77,8 @@ sys_info() ->
| MemInfo].
alloc_info() ->
- {_,_,AllocTypes,_} = erlang:system_info(allocator),
- try erlang:system_info({allocator_sizes,AllocTypes}) of
+ AlcuAllocs = erlang:system_info(alloc_util_allocators),
+ try erlang:system_info({allocator_sizes, AlcuAllocs}) of
Allocators -> Allocators
catch _:_ -> []
end.