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

fix(vm): memory calc add `literal_alloc`

src/emqx.appup.src

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

src/emqx_vm.erl

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