Merge branch 'lukas/erts/rename_xmqd_to_hmqd/OTP-13366'

* lukas/erts/rename_xmqd_to_hmqd/OTP-13366:
  erts: Rename erl flag +xmqd to +hmqd in erlexec
  Fix proc_lib message_queue_data spec
  erts: Fix total_heap_size calculation for on_heap
  erts: Rename erl flag +xmqd to +hmqd

8 files changed, 91 insertions, 77 deletions

diff --git a/erts/doc/src/erl.xml b/erts/doc/src/erl.xml
index e13470c83c..c499fc8081 100644
--- a/erts/doc/src/erl.xml
+++ b/erts/doc/src/erl.xml
@@ -632,6 +632,15 @@
         <p>Sets the initial process dictionary size of processes to the size
           <c><![CDATA[Size]]></c>.</p>
       </item>
+      <tag><marker id="+hmqd"><c>+hmqd off_heap|on_heap|mixed</c></marker></tag>
+      <item><p>
+	Sets the default value for the process flag
+	<c>message_queue_data</c>. If <c>+hmqd</c> is not
+	passed, <c>mixed</c> will be the default. For more information,
+	see the documentation of
+        <seealso marker="erlang#process_flag_message_queue_data"><c>process_flag(message_queue_data,
+	MQD)</c></seealso>.
+      </p></item>
       <tag><c><![CDATA[+K true | false]]></c></tag>
       <item>
         <p>Enables or disables the kernel poll functionality if
@@ -1361,21 +1370,6 @@
           <seealso marker="kernel:error_logger#warning_map/0">error_logger(3)</seealso>
           for further information.</p>
       </item>
-      <tag><c><![CDATA[+xFlag Value]]></c></tag>
-      <item>
-        <p>Default process flag settings.</p>
-        <taglist>
-          <tag><marker id="+xmqd"><c>+xmqd off_heap|on_heap|mixed</c></marker></tag>
-          <item><p>
-	    Sets the default value for the process flag
-	    <c>message_queue_data</c>. If <c>+xmqd</c> is not
-	    passed, <c>mixed</c> will be the default. For more information,
-	    see the documentation of
-            <seealso marker="erlang#process_flag_message_queue_data"><c>process_flag(message_queue_data,
-	    MQD)</c></seealso>.
-	  </p></item>
-	</taglist>
-      </item>
       <tag><c><![CDATA[+zFlag Value]]></c></tag>
       <item>
         <p>Miscellaneous flags.</p>
diff --git a/erts/doc/src/erlang.xml b/erts/doc/src/erlang.xml
index 1daa582584..4b5a27751a 100644
--- a/erts/doc/src/erlang.xml
+++ b/erts/doc/src/erlang.xml
@@ -4371,7 +4371,7 @@ os_prompt% </pre>
         </taglist>
 	<p>
 	  The default <c>message_queue_data</c> process flag is determined
-	  by the <seealso marker="erl#+xmqd"><c>+xmqd</c></seealso>
+	  by the <seealso marker="erl#+hmqd"><c>+hmqd</c></seealso>
 	  <c>erl</c> command line argument.
 	</p>
 	<p>
@@ -4878,7 +4878,9 @@ os_prompt% </pre>
           <tag><c>{total_heap_size, <anno>Size</anno>}</c></tag>
           <item>
             <p><c><anno>Size</anno></c> is the total size, in words, of all heap
-	    fragments of the process. This includes the process stack.</p>
+	    fragments of the process. This includes the process stack and
+            any unreceived messages that are considered to be part of the
+            heap. </p>
           </item>
           <tag><c>{trace, <anno>InternalTraceFlags</anno>}</c></tag>
           <item>
@@ -5709,7 +5711,7 @@ true</pre>
 	    flag. <c><anno>MQD</anno></c> should be either <c>off_heap</c>,
 	    <c>on_heap</c>, or <c>mixed</c>. The default
 	    <c>message_queue_data</c> process flag is determined by the
-	    <seealso marker="erl#+xmqd"><c>+xmqd</c></seealso> <c>erl</c>
+	    <seealso marker="erl#+hmqd"><c>+hmqd</c></seealso> <c>erl</c>
 	    command line argument. For more information, see the
 	    documentation of
             <seealso marker="#process_flag_message_queue_data"><c>process_flag(message_queue_data,
@@ -7388,7 +7390,7 @@ ok
             <p>Returns the default value of the <c>message_queue_data</c>
 	    process flag which is either <c>off_heap</c>, <c>on_heap</c>, or <c>mixed</c>.
 	    This default is set by the <c>erl</c> command line argument
-	    <seealso marker="erl#+xmqd"><c>+xmqd</c></seealso>. For more information on the
+	    <seealso marker="erl#+hmqd"><c>+hmqd</c></seealso>. For more information on the
 	    <c>message_queue_data</c> process flag, see documentation of
             <seealso marker="#process_flag_message_queue_data"><c>process_flag(message_queue_data,
 	    MQD)</c></seealso>.</p>
diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index c9741b361f..99fe847ba2 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -1359,9 +1359,10 @@ process_info_aux(Process *BIF_P,
 
 	total_heap_size += rp->mbuf_sz;
 
-	for (mp = rp->msg.first; mp; mp = mp->next)
-	    if (mp->data.attached)
-		total_heap_size += erts_msg_attached_data_size(mp);
+        if (rp->flags & F_ON_HEAP_MSGQ)
+            for (mp = rp->msg.first; mp; mp = mp->next)
+                if (mp->data.attached)
+                    total_heap_size += erts_msg_attached_data_size(mp);
 
 	(void) erts_bld_uint(NULL, &hsz, total_heap_size);
 	hp = HAlloc(BIF_P, hsz);
diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index df5d0f4918..cf54f1e384 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -3009,10 +3009,30 @@ erts_process_gc_info(Process *p, Uint *sizep, Eterm **hpp)
     };
 
     Eterm res = THE_NON_VALUE;
+    ErtsMessage *mp;
 
     ERTS_CT_ASSERT(sizeof(values)/sizeof(*values) == sizeof(tags)/sizeof(*tags));
     ERTS_CT_ASSERT(sizeof(values)/sizeof(*values) == ERTS_PROCESS_GC_INFO_MAX_TERMS);
 
+    if (p->abandoned_heap) {
+        Eterm *htop, *heap;
+        ERTS_GET_ORIG_HEAP(p, heap, htop);
+        values[3] = HIGH_WATER(p) - heap;
+        values[6] = htop - heap;
+    }
+
+    if (p->flags & F_ON_HEAP_MSGQ) {
+        /* If on heap messages in the internal queue are counted
+           as being part of the heap, so we have to add them to the
+           am_mbuf_size value. process_info(total_heap_size) should
+           be the same as adding old_heap_block_size + heap_block_size
+           + mbuf_size.
+        */
+        for (mp = p->msg.first; mp; mp = mp->next)
+            if (mp->data.attached)
+                values[2] += erts_msg_attached_data_size(mp);
+    }
+
     res = erts_bld_atom_uword_2tup_list(hpp,
                                         sizep,
                                         sizeof(values)/sizeof(*values),
diff --git a/erts/emulator/beam/erl_init.c b/erts/emulator/beam/erl_init.c
index dec9bdfedc..2fd1eeb785 100644
--- a/erts/emulator/beam/erl_init.c
+++ b/erts/emulator/beam/erl_init.c
@@ -578,6 +578,8 @@ void erts_usage(void)
 	       VH_DEFAULT_SIZE);
     erts_fprintf(stderr, "-hpds size     initial process dictionary size (default %d)\n",
 	       erts_pd_initial_size);
+    erts_fprintf(stderr, "-hmqd  val     set default message queue data flag for processes,\n");
+    erts_fprintf(stderr, "               valid values are: off_heap | on_heap | mixed\n");
 
     /*    erts_fprintf(stderr, "-i module  set the boot module (default init)\n"); */
 
@@ -655,8 +657,6 @@ void erts_usage(void)
 
     erts_fprintf(stderr, "-W<i|w|e>      set error logger warnings mapping,\n");
     erts_fprintf(stderr, "               see error_logger documentation for details\n");
-    erts_fprintf(stderr, "-xmqd  val     set default message queue data flag for processes,\n");
-    erts_fprintf(stderr, "               valid values are: off_heap | on_heap | mixed\n");
     erts_fprintf(stderr, "-zdbbl size    set the distribution buffer busy limit in kilobytes\n");
     erts_fprintf(stderr, "               valid range is [1-%d]\n", INT_MAX/1024);
     erts_fprintf(stderr, "-zdntgc time   set delayed node table gc in seconds\n");
@@ -1487,6 +1487,7 @@ erl_start(int argc, char **argv)
 	     * h|ms  - min_heap_size
 	     * h|mbs - min_bin_vheap_size
 	     * h|pds - erts_pd_initial_size
+	     * h|mqd - message_queue_data
 	     *
 	     */
 	    if (has_prefix("mbs", sub_param)) {
@@ -1512,6 +1513,23 @@ erl_start(int argc, char **argv)
 		}
 		VERBOSE(DEBUG_SYSTEM, ("using initial process dictionary size %d\n",
 			    erts_pd_initial_size));
+            } else if (has_prefix("mqd", sub_param)) {
+		arg = get_arg(sub_param+3, argv[i+1], &i);
+		if (sys_strcmp(arg, "mixed") == 0)
+		    erts_default_spo_flags &= ~(SPO_ON_HEAP_MSGQ|SPO_OFF_HEAP_MSGQ);
+		else if (sys_strcmp(arg, "on_heap") == 0) {
+		    erts_default_spo_flags &= ~SPO_OFF_HEAP_MSGQ;
+		    erts_default_spo_flags |= SPO_ON_HEAP_MSGQ;
+		}
+		else if (sys_strcmp(arg, "off_heap") == 0) {
+		    erts_default_spo_flags &= ~SPO_ON_HEAP_MSGQ;
+		    erts_default_spo_flags |= SPO_OFF_HEAP_MSGQ;
+		}
+		else {
+		    erts_fprintf(stderr,
+				 "Invalid message_queue_data flag: %s\n", arg);
+		    erts_usage();
+		}
 	    } else {
 	        /* backward compatibility */
 		arg = get_arg(argv[i]+2, argv[i+1], &i);
@@ -2047,32 +2065,6 @@ erl_start(int argc, char **argv)
 	    }
 	    break;
 
-	case 'x': {
-	    char *sub_param = argv[i]+2;
-	    if (has_prefix("mqd", sub_param)) {
-		arg = get_arg(sub_param+3, argv[i+1], &i);
-		if (sys_strcmp(arg, "mixed") == 0)
-		    erts_default_spo_flags &= ~(SPO_ON_HEAP_MSGQ|SPO_OFF_HEAP_MSGQ);
-		else if (sys_strcmp(arg, "on_heap") == 0) {
-		    erts_default_spo_flags &= ~SPO_OFF_HEAP_MSGQ;
-		    erts_default_spo_flags |= SPO_ON_HEAP_MSGQ;
-		}
-		else if (sys_strcmp(arg, "off_heap") == 0) {
-		    erts_default_spo_flags &= ~SPO_ON_HEAP_MSGQ;
-		    erts_default_spo_flags |= SPO_OFF_HEAP_MSGQ;
-		}
-		else {
-		    erts_fprintf(stderr,
-				 "Invalid message_queue_data flag: %s\n", arg);
-		    erts_usage();
-		}
-	    } else {
-		erts_fprintf(stderr, "bad -x option %s\n", argv[i]);
-		erts_usage();
-	    }
-	    break;
-        }
-
 	case 'z': {
 	    char *sub_param = argv[i]+2;
 
diff --git a/erts/emulator/test/message_queue_data_SUITE.erl b/erts/emulator/test/message_queue_data_SUITE.erl
index 6efca5b39e..226462676c 100644
--- a/erts/emulator/test/message_queue_data_SUITE.erl
+++ b/erts/emulator/test/message_queue_data_SUITE.erl
@@ -21,7 +21,7 @@
 -module(message_queue_data_SUITE).
 
 -export([all/0, suite/0]).
--export([basic/1, process_info_messages/1]).
+-export([basic/1, process_info_messages/1, total_heap_size/1]).
 
 -export([basic_test/1]).
 
@@ -32,7 +32,7 @@ suite() ->
      {timetrap, {minutes, 2}}].
 
 all() -> 
-    [basic, process_info_messages].
+    [basic, process_info_messages, total_heap_size].
 
 %%
 %%
@@ -44,15 +44,15 @@ basic(Config) when is_list(Config) ->
 
     basic_test(erlang:system_info(message_queue_data)),
 
-    {ok, Node1} = start_node(Config, "+xmqd off_heap"),
+    {ok, Node1} = start_node(Config, "+hmqd off_heap"),
     ok = rpc:call(Node1, ?MODULE, basic_test, [off_heap]),
     stop_node(Node1),
 
-    {ok, Node2} = start_node(Config, "+xmqd on_heap"),
+    {ok, Node2} = start_node(Config, "+hmqd on_heap"),
     ok = rpc:call(Node2, ?MODULE, basic_test, [on_heap]),
     stop_node(Node2),
 
-    {ok, Node3} = start_node(Config, "+xmqd mixed"),
+    {ok, Node3} = start_node(Config, "+hmqd mixed"),
     ok = rpc:call(Node3, ?MODULE, basic_test, [mixed]),
     stop_node(Node3),
 
@@ -190,6 +190,28 @@ process_info_messages(Config) when is_list(Config) ->
 
     ok.
 
+total_heap_size(_Config) ->
+
+    Fun = fun F() -> receive Pid when is_pid(Pid) -> Pid ! ok,F() end end,
+
+    %% Test that on_heap messages grow the heap even if they are not received
+    OnPid = spawn_opt(Fun, [{message_queue_data, on_heap}]),
+    {total_heap_size, OnSize} = erlang:process_info(OnPid, total_heap_size),
+    [OnPid ! lists:duplicate(N,N) || N <- lists:seq(1,100)],
+    OnPid ! self(), receive ok -> ok end,
+    {total_heap_size, OnSizeAfter} = erlang:process_info(OnPid, total_heap_size),
+    ct:log("OnSize = ~p, OnSizeAfter = ~p",[OnSize, OnSizeAfter]),
+    true = OnSize < OnSizeAfter,
+
+    %% Test that off_heap messages do not grow the heap if they are not received
+    OffPid = spawn_opt(Fun, [{message_queue_data, off_heap}]),
+    {total_heap_size, OffSize} = erlang:process_info(OffPid, total_heap_size),
+    [OffPid ! lists:duplicate(N,N) || N <- lists:seq(1,100)],
+    OffPid ! self(), receive ok -> ok end,
+    {total_heap_size, OffSizeAfter} = erlang:process_info(OffPid, total_heap_size),
+    ct:log("OffSize = ~p, OffSizeAfter = ~p",[OffSize, OffSizeAfter]),
+    true = OffSize == OffSizeAfter.
+
 %%
 %%
 %% helpers
diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
index 82a0303f86..5a5021b003 100644
--- a/erts/etc/common/erlexec.c
+++ b/erts/etc/common/erlexec.c
@@ -150,6 +150,7 @@ static char *plush_val_switches[] = {
     "ms",
     "mbs",
     "pds",
+    "mqd",
     "",
     NULL
 };
@@ -160,12 +161,6 @@ static char *plusr_val_switches[] = {
     NULL
 };
 
-/* +x arguments with values */
-static char *plusx_val_switches[] = {
-    "mqd",
-    NULL
-};
-
 /* +z arguments with values */
 static char *plusz_val_switches[] = {
     "dbbl",
@@ -986,20 +981,6 @@ int main(int argc, char **argv)
 		      add_Eargs(argv[i+1]);
 		      i++;
 		      break;
-		  case 'x':
-		      if (!is_one_of_strings(&argv[i][2], plusx_val_switches)) {
-			  goto the_default;
-		      } else {
-			  if (i+1 >= argc
-			      || argv[i+1][0] == '-'
-			      || argv[i+1][0] == '+')
-			      usage(argv[i]);
-			  argv[i][0] = '-';
-			  add_Eargs(argv[i]);
-			  add_Eargs(argv[i+1]);
-			  i++;
-		      }
-		      break;
 		  case 'z':
 		      if (!is_one_of_strings(&argv[i][2], plusz_val_switches)) {
 			  goto the_default;
@@ -1200,7 +1181,7 @@ usage_aux(void)
 	  "[+S NO_SCHEDULERS:NO_SCHEDULERS_ONLINE] "
 	  "[+SP PERCENTAGE_SCHEDULERS:PERCENTAGE_SCHEDULERS_ONLINE] "
 	  "[+T LEVEL] [+V] [+v] "
-	  "[+W<i|w|e>]  [+x DEFAULT_PROC_FLAGS] [+z MISC_OPTION] [args ...]\n");
+	  "[+W<i|w|e>] [+z MISC_OPTION] [args ...]\n");
   exit(1);
 }
 
diff --git a/lib/stdlib/src/proc_lib.erl b/lib/stdlib/src/proc_lib.erl
index 3f79ed0f87..fdc2ae4070 100644
--- a/lib/stdlib/src/proc_lib.erl
+++ b/lib/stdlib/src/proc_lib.erl
@@ -48,7 +48,9 @@
                         | {'priority', priority_level()}
                         | {'min_heap_size', non_neg_integer()}
                         | {'min_bin_vheap_size', non_neg_integer()}
-                        | {'fullsweep_after', non_neg_integer()}.
+                        | {'fullsweep_after', non_neg_integer()}
+                        | {'message_queue_data',
+                             'off_heap' | 'on_heap' | 'mixed' }.
 
 -type dict_or_pid()    :: pid()
                         | (ProcInfo :: [_])