diff options
| author | Rickard Green <[email protected]> | 2013-11-25 09:06:53 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-11-25 09:06:53 +0100 |
| commit | f01eb9919311c6566d38c50625518d1b68aca73c (patch) | |
| tree | 8eacc64cdad1f73e3f7816095f90274f4fc7a217 /lib | |
| parent | 85266798ccd3a55361aa2ffa5c587d4c3f8cc3ae (diff) | |
| parent | e6b3e1499677fa0aff83e0416ea9a58ffab95210 (diff) | |
| download | otp-f01eb9919311c6566d38c50625518d1b68aca73c.tar.gz otp-f01eb9919311c6566d38c50625518d1b68aca73c.tar.bz2 otp-f01eb9919311c6566d38c50625518d1b68aca73c.zip | |
Merge branch 'maint'
* maint:
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')
| -rw-r--r-- | lib/runtime_tools/src/observer_backend.erl | 4 |
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. |