diff options
| author | Sverker Eriksson <[email protected]> | 2013-09-26 22:36:34 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2013-09-30 17:45:47 +0200 |
| commit | 059d8b76011f960cc5938501a33002b051b0bca2 (patch) | |
| tree | be0900966bbc9186356a59cf8e675ff0da49991f /erts/preloaded | |
| parent | 8d5b9a53a1fd5e2264d705911af23cd484ccead0 (diff) | |
| download | otp-059d8b76011f960cc5938501a33002b051b0bca2.tar.gz otp-059d8b76011f960cc5938501a33002b051b0bca2.tar.bz2 otp-059d8b76011f960cc5938501a33002b051b0bca2.zip | |
erts: Add erts_mmap stats
As part of erlang:system_info({allocator,mseg_alloc})
and erl_crash.dump
Diffstat (limited to 'erts/preloaded')
| -rw-r--r-- | erts/preloaded/ebin/erlang.beam | bin | 94156 -> 94244 bytes | |||
| -rw-r--r-- | erts/preloaded/src/erlang.erl | 2 |
2 files changed, 2 insertions, 0 deletions
diff --git a/erts/preloaded/ebin/erlang.beam b/erts/preloaded/ebin/erlang.beam Binary files differindex f1791200e0..5a9ffa89d1 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 d40ee7c59a..2b6760c675 100644 --- a/erts/preloaded/src/erlang.erl +++ b/erts/preloaded/src/erlang.erl @@ -3499,6 +3499,8 @@ mk_res_list([]) -> mk_res_list([Alloc | Rest]) -> [{Alloc, []} | mk_res_list(Rest)]. +insert_instance(I, N, Rest) when erlang:is_atom(N) -> + [{N, I} | Rest]; insert_instance(I, N, []) -> [{instance, N, I}]; insert_instance(I, N, [{instance, M, _}|_] = Rest) when N < M -> |