From a7cd1ad30be7ad27b5f0e84392d141c34c148651 Mon Sep 17 00:00:00 2001 From: JimMoen Date: Wed, 24 Nov 2021 18:49:13 +0800 Subject: [PATCH 1/2] fix(mgmt): node memory usage info --- apps/emqx_management/src/emqx_mgmt.erl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/apps/emqx_management/src/emqx_mgmt.erl b/apps/emqx_management/src/emqx_mgmt.erl index f82b881a8..d45b5ad77 100644 --- a/apps/emqx_management/src/emqx_mgmt.erl +++ b/apps/emqx_management/src/emqx_mgmt.erl @@ -149,7 +149,7 @@ node_info(Node) when Node =:= node() -> Info#{node => node(), otp_release => iolist_to_binary(otp_rel()), memory_total => proplists:get_value(allocated, Memory), - memory_used => proplists:get_value(total, Memory), + memory_used => proplists:get_value(used, Memory), process_available => erlang:system_info(process_limit), process_used => erlang:system_info(process_count), @@ -650,4 +650,3 @@ max_row_limit() -> ?MAX_ROW_LIMIT. table_size(Tab) -> ets:info(Tab, size). - From d4246ad2f60870839f929ea85ef673ddc5a774bb Mon Sep 17 00:00:00 2001 From: JimMoen Date: Thu, 25 Nov 2021 14:41:40 +0800 Subject: [PATCH 2/2] fix(vm): add literal_alloc memory calculation --- apps/emqx/src/emqx_vm.erl | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/emqx/src/emqx_vm.erl b/apps/emqx/src/emqx_vm.erl index 06e17513b..91b3e54f9 100644 --- a/apps/emqx/src/emqx_vm.erl +++ b/apps/emqx/src/emqx_vm.erl @@ -57,6 +57,7 @@ sl_alloc, ll_alloc, fix_alloc, + literal_alloc, std_alloc ]).