yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6861 from JimMoen/fix-vm-mem-calc 

fix(vm): memory calc add `literal_alloc`
This commit is contained in:
JimMoen 2022-01-26 14:13:38 +08:00 committed by GitHub
parent 8cdfb531a7 67a1c463e7
commit d398c5b943
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/emqx.appup.src
View File

@ -4,6 +4,7 @@
[ [
{"4.2.0", [ {"4.2.0", [
{add_module, emqx_congestion}, {add_module, emqx_congestion},
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_alarm, brutal_purge, soft_purge, []}, {load_module, emqx_alarm, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_session, brutal_purge, soft_purge, []}, {load_module, emqx_session, brutal_purge, soft_purge, []},
@ -29,6 +30,7 @@
]}, ]},
{"4.2.1", [ {"4.2.1", [
{add_module, emqx_congestion}, {add_module, emqx_congestion},
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_alarm, brutal_purge, soft_purge, []}, {load_module, emqx_alarm, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_session, brutal_purge, soft_purge, []}, {load_module, emqx_session, brutal_purge, soft_purge, []},
@ -53,6 +55,7 @@
]}, ]},
{<<"4.2.[23]">>, [ {<<"4.2.[23]">>, [
{add_module, emqx_congestion}, {add_module, emqx_congestion},
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_alarm, brutal_purge, soft_purge, []}, {load_module, emqx_alarm, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
@ -74,6 +77,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.4">>, [ {<<"4.2.4">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_session, brutal_purge, soft_purge, []}, {load_module, emqx_session, brutal_purge, soft_purge, []},
@ -94,6 +98,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.5">>, [ {<<"4.2.5">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_session, brutal_purge, soft_purge, []}, {load_module, emqx_session, brutal_purge, soft_purge, []},
@ -114,6 +119,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.[6-7]">>, [ {<<"4.2.[6-7]">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_connection, brutal_purge, soft_purge, []}, {load_module, emqx_connection, brutal_purge, soft_purge, []},
@ -127,6 +133,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.8">>, [ {<<"4.2.8">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_connection, brutal_purge, soft_purge, []}, {load_module, emqx_connection, brutal_purge, soft_purge, []},
@ -135,6 +142,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.9">>, [ {<<"4.2.9">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_connection, brutal_purge, soft_purge, []}, {load_module, emqx_connection, brutal_purge, soft_purge, []},
{load_module, emqx_ws_connection, brutal_purge, soft_purge, []}, {load_module, emqx_ws_connection, brutal_purge, soft_purge, []},
@ -144,6 +152,7 @@
], ],
[ [
{"4.2.0", [ {"4.2.0", [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_shared_sub, brutal_purge, soft_purge, []}, {load_module, emqx_shared_sub, brutal_purge, soft_purge, []},
{load_module, emqx_os_mon, brutal_purge, soft_purge, []}, {load_module, emqx_os_mon, brutal_purge, soft_purge, []},
{load_module, emqx_alarm, brutal_purge, soft_purge, []}, {load_module, emqx_alarm, brutal_purge, soft_purge, []},
@ -169,6 +178,7 @@
{load_module,emqx_misc,brutal_purge,soft_purge,[]} {load_module,emqx_misc,brutal_purge,soft_purge,[]}
]}, ]},
{"4.2.1", [ {"4.2.1", [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_shared_sub, brutal_purge, soft_purge, []}, {load_module, emqx_shared_sub, brutal_purge, soft_purge, []},
{load_module, emqx_os_mon, brutal_purge, soft_purge, []}, {load_module, emqx_os_mon, brutal_purge, soft_purge, []},
{load_module, emqx_limiter, brutal_purge, soft_purge, []}, {load_module, emqx_limiter, brutal_purge, soft_purge, []},
@ -193,6 +203,7 @@
{load_module,emqx_misc,brutal_purge,soft_purge,[]} {load_module,emqx_misc,brutal_purge,soft_purge,[]}
]}, ]},
{<<"4.2.[23]">>, [ {<<"4.2.[23]">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_shared_sub, brutal_purge, soft_purge, []}, {load_module, emqx_shared_sub, brutal_purge, soft_purge, []},
{load_module, emqx_os_mon, brutal_purge, soft_purge, []}, {load_module, emqx_os_mon, brutal_purge, soft_purge, []},
{update, emqx_connection, {advanced, []}}, {update, emqx_connection, {advanced, []}},
@ -215,6 +226,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.4">>, [ {<<"4.2.4">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_congestion, brutal_purge, soft_purge, []}, {load_module, emqx_congestion, brutal_purge, soft_purge, []},
@ -235,6 +247,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.5">>, [ {<<"4.2.5">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_session, brutal_purge, soft_purge, []}, {load_module, emqx_session, brutal_purge, soft_purge, []},
@ -255,6 +268,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.[6-7]">>, [ {<<"4.2.[6-7]">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_connection, brutal_purge, soft_purge, []}, {load_module, emqx_connection, brutal_purge, soft_purge, []},
@ -268,6 +282,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.8">>, [ {<<"4.2.8">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_channel, brutal_purge, soft_purge, []}, {load_module, emqx_channel, brutal_purge, soft_purge, []},
{load_module, emqx_connection, brutal_purge, soft_purge, []}, {load_module, emqx_connection, brutal_purge, soft_purge, []},
@ -276,6 +291,7 @@
{load_module, emqx_limiter, brutal_purge, soft_purge, []} {load_module, emqx_limiter, brutal_purge, soft_purge, []}
]}, ]},
{<<"4.2.9">>, [ {<<"4.2.9">>, [
{load_module, emqx_vm, brutal_purge, soft_purge, []},
{load_module, emqx_frame, brutal_purge, soft_purge, []}, {load_module, emqx_frame, brutal_purge, soft_purge, []},
{load_module, emqx_connection, brutal_purge, soft_purge, []}, {load_module, emqx_connection, brutal_purge, soft_purge, []},
{load_module, emqx_ws_connection, brutal_purge, soft_purge, []}, {load_module, emqx_ws_connection, brutal_purge, soft_purge, []},

2
src/emqx_vm.erl
View File

@ -64,6 +64,7 @@
sl_alloc, sl_alloc,
ll_alloc, ll_alloc,
fix_alloc, fix_alloc,
literal_alloc,
std_alloc std_alloc
]). ]).
@ -484,4 +485,3 @@ compat_windows(Fun) ->
_Error -> 0 _Error -> 0
end end
end. end.