diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-09-18 18:29:08 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-09-18 18:29:08 +0100 |
| commit | 3316ecc0e7b461d3e7e7adf74bd21ed994f3d115 (patch) | |
| tree | 9e0dd0a8317ab440a9924761917f635162071b22 | |
| parent | e24b78cc109bf28b354395bb1f786042c95ddf92 (diff) | |
| download | rabbitmq-server-3316ecc0e7b461d3e7e7adf74bd21ed994f3d115.tar.gz | |
Try to keep our categories disjoint.
| -rw-r--r-- | src/rabbit.erl | 3 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 17 |
2 files changed, 12 insertions, 8 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 3809c079..ff908b75 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -356,7 +356,8 @@ status() -> {running_applications, application:which_applications(infinity)}, {os, os:type()}, {erlang_version, erlang:system_info(system_version)}, - {memory, rabbit_misc:memory()}], + {memory_used, erlang:memory(total)}, + {memory_details, rabbit_misc:memory()}], S2 = rabbit_misc:filter_exit_map( fun ({Key, {M, F, A}}) -> {Key, erlang:apply(M, F, A)} end, [{vm_memory_high_watermark, {vm_memory_monitor, diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index 996d8ced..c928f58c 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -997,18 +997,21 @@ memory() -> Qs = sum_proc_memory(QPids), Mnesia = mnesia_memory(), MsgIndex = ets_memory(rabbit_msg_store_ets_index), - [{total, erlang:memory(total)}, - {connection_procs, Conns}, + ETS = erlang:memory(ets), + Atom = erlang:memory(atom), + Bin = erlang:memory(binary), + Code = erlang:memory(code), + [{connection_procs, Conns}, {channel_procs, Chs}, {queue_procs, Qs}, {other_procs, erlang:memory(processes) - Conns - Chs - Qs}, {mnesia, Mnesia}, {msg_index, MsgIndex}, - {other_ets, erlang:memory(ets) - Mnesia - MsgIndex}, - {binary, erlang:memory(binary)}, - {system, erlang:memory(system)}, - {atom, erlang:memory(atom)}, - {code, erlang:memory(code)}]. + {other_ets, ETS - Mnesia - MsgIndex}, + {binary, Bin}, + {real_system, erlang:memory(system) - ETS - Atom - Bin - Code}, + {atom, Atom}, + {code, Code}]. sum_proc_memory(Pids) -> lists:foldl( |