diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2017-07-11 04:30:53 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2017-07-11 04:30:53 +0300 |
| commit | 9aad266b813f12cf9e2dd31f48c02433eec1431c (patch) | |
| tree | b161c90397e5cae14e7379c11e9ccd6c1359c955 /src | |
| parent | 36ef3ab70f56938e14f7ed0d65f8fa5ff2171219 (diff) | |
| parent | 6967bb30cec8af59e76bcbe098dd0e959c09eacc (diff) | |
| download | rabbitmq-server-git-9aad266b813f12cf9e2dd31f48c02433eec1431c.tar.gz | |
Merge branch 'stable'
Conflicts:
test/unit_inbroker_parallel_SUITE.erl
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_vm.erl | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_vm.erl b/src/rabbit_vm.erl index c2353ab85f..3ae482a934 100644 --- a/src/rabbit_vm.erl +++ b/src/rabbit_vm.erl @@ -54,14 +54,13 @@ memory() -> MgmtDbETS = ets_memory([rabbit_mgmt_storage]), OsTotal = vm_memory_monitor:get_process_memory(), - [{total, ErlangTotal}, - {processes, Processes}, + [{processes, Processes}, {ets, ETS}, {atom, Atom}, {binary, Bin}, {code, Code}, {system, System}] = - erlang:memory([total, processes, ets, atom, binary, code, system]), + erlang:memory([processes, ets, atom, binary, code, system]), OtherProc = Processes - ConnsReader - ConnsWriter - ConnsChannel - ConnsOther @@ -97,7 +96,7 @@ memory() -> %% System {code, Code}, {atom, Atom}, - {other_system, System - ETS - Bin - Code - Atom + (OsTotal - ErlangTotal)}, + {other_system, System - ETS - Bin - Code - Atom}, {total, OsTotal} ]. |