diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_vm.erl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index 9c8732bb6b..e731f7e97b 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -42,9 +42,11 @@ memory() -> [aggregate(Names, Sums, memory, fun (X) -> X end) || Names <- distinguished_interesting_sups()], - Mnesia = mnesia_memory(), - MsgIndexETS = ets_memory([msg_store_persistent, msg_store_transient]), - MgmtDbETS = ets_memory([rabbit_mgmt_event_collector]), + Mnesia = mnesia_memory(), + MsgIndexETS = ets_memory([msg_store_persistent, msg_store_transient]), + MetricsETS = ets_memory([rabbit_metrics]), + [{_, MetricsProc}] = process_info(whereis(rabbit_metrics), [memory]), + MgmtDbETS = ets_memory([rabbit_mgmt_storage]), [{total, Total}, {processes, Processes}, @@ -57,7 +59,7 @@ memory() -> OtherProc = Processes - ConnsReader - ConnsWriter - ConnsChannel - ConnsOther - - Qs - QsSlave - MsgIndexProc - Plugins - MgmtDbProc, + - Qs - QsSlave - MsgIndexProc - Plugins - MgmtDbProc - MetricsProc, [{total, Total}, {connection_readers, ConnsReader}, @@ -69,6 +71,7 @@ memory() -> {plugins, Plugins}, {other_proc, lists:max([0, OtherProc])}, %% [1] {mnesia, Mnesia}, + {metrics, MetricsETS + MetricsProc}, {mgmt_db, MgmtDbETS + MgmtDbProc}, {msg_index, MsgIndexETS + MsgIndexProc}, {other_ets, ETS - Mnesia - MsgIndexETS - MgmtDbETS}, @@ -142,7 +145,7 @@ interesting_sups() -> interesting_sups0() -> MsgIndexProcs = [msg_store_transient, msg_store_persistent], - MgmtDbProcs = [rabbit_mgmt_sup_sup], + MgmtDbProcs = [rabbit_mgmt_sup], PluginProcs = plugin_sups(), [MsgIndexProcs, MgmtDbProcs, PluginProcs]. |