Merge branch 'maint'

* maint:
  Add number of entries to mnesia copy debug message
  Add thread index to allocator enomem dump slogan
  Add run queue index to process dump info
  Add missing error string to syslog logging in epmd
  Demote rare debug slogan of message discarding to debug build

6 files changed, 32 insertions, 17 deletions

diff --git a/erts/doc/src/crash_dump.xml b/erts/doc/src/crash_dump.xml
index c59741f250..d3de29b876 100644
--- a/erts/doc/src/crash_dump.xml
+++ b/erts/doc/src/crash_dump.xml
@@ -85,20 +85,22 @@
         operating system.</p>
       <list type="bulleted">
         <item>"<em>&lt;A&gt;</em>: Cannot allocate <em>&lt;N&gt;</em>
-         bytes of memory (of type "<em>&lt;T&gt;</em>")." - The system
-         has run out of memory. &lt;A&gt; is the allocator that failed
-         to allocate memory, &lt;N&gt; is the number of bytes that
-         &lt;A&gt; tried to allocate, and &lt;T&gt; is the memory block
-         type that the memory was needed for. The most common case is
-         that a process stores huge amounts of data. In this case
-         &lt;T&gt; is most often <c><![CDATA[heap]]></c>, <c><![CDATA[old_heap]]></c>,
-        <c><![CDATA[heap_frag]]></c>, or <c><![CDATA[binary]]></c>. For more information on
-         allocators see
-        <seealso marker="erts_alloc">erts_alloc(3)</seealso>.</item>
+         bytes of memory (of type "<em>&lt;T&gt;</em>", thread
+         <em>&lt;I&gt;</em>em>)." - The system has run out of memory. &lt;A&gt;
+         is the allocator that failed to allocate memory, &lt;N&gt; is the
+         number of bytes that &lt;A&gt; tried to allocate, &lt;T&gt; is the
+         memory block type that the memory was needed for, and &lt;I&gt; is the
+         thread identifier. The most common case is that a process stores huge
+         amounts of data. In this case &lt;T&gt; is most often
+         <c><![CDATA[heap]]></c>, <c><![CDATA[old_heap]]></c>,
+         <c><![CDATA[heap_frag]]></c>, or <c><![CDATA[binary]]></c>.
+         For more information on allocators see
+         <seealso marker="erts_alloc">erts_alloc(3)</seealso>.</item>
         <item>"<em>&lt;A&gt;</em>: Cannot reallocate <em>&lt;N&gt;</em>
-         bytes of memory (of type "<em>&lt;T&gt;</em>")." - Same as
-         above with the exception that memory was being reallocated
-         instead of being allocated when the system ran out of memory.</item>
+         bytes of memory (of type "<em>&lt;T&gt;</em>", thread
+         <em>&lt;I&gt;</em>em>)." - Same as above with the exception that memory
+         was being reallocated instead of being allocated when the system ran
+         out of memory.</item>
         <item>"Unexpected op code <em>N</em>" - Error in compiled
          code, <c><![CDATA[beam]]></c> file damaged or error in the compiler.</item>
         <item>"Module <em>Name</em> undefined" <c><![CDATA[|]]></c> "Function
@@ -246,6 +248,9 @@
       <tag><em>Last scheduled in for | Current call</em></tag>
       <item>The current function of the process. These fields will not
        always exist.</item>
+      <tag><em>Run queue</em></tag>
+      <item>The identifier of the scheduler run queue in which the process is
+       running.</item>
       <tag><em>Spawned by</em></tag>
       <item>The parent of the process, i.e. the process which executed
       <c><![CDATA[spawn]]></c> or <c><![CDATA[spawn_link]]></c>.</item>
diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 4a84dcfe34..bc56143def 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -1869,6 +1869,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) {
     } else if (is_external_pid(to)) {
 	dep = external_pid_dist_entry(to);
 	if(dep == erts_this_dist_entry) {
+#if DEBUG
 	    erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
 	    erts_dsprintf(dsbufp,
 			  "Discarding message %T from %T to %T in an old "
@@ -1879,6 +1880,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) {
 			  external_pid_creation(to),
 			  erts_this_node->creation);
 	    erts_send_error_to_logger(p->group_leader, dsbufp);
+#endif
 	    return 0;
 	}
 	return remote_send(p, dep, to, to, msg, suspend);
@@ -1912,6 +1914,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) {
     } else if (is_external_port(to)
 	       && (external_port_dist_entry(to)
 		   == erts_this_dist_entry)) {
+#if DEBUG
 	erts_dsprintf_buf_t *dsbufp = erts_create_logger_dsbuf();
 	erts_dsprintf(dsbufp,
 		      "Discarding message %T from %T to %T in an old "
@@ -1922,6 +1925,7 @@ do_send(Process *p, Eterm to, Eterm msg, int suspend, Eterm *refp) {
 		      external_port_creation(to),
 		      erts_this_node->creation);
 	erts_send_error_to_logger(p->group_leader, dsbufp);
+#endif
 	return 0;
     } else if (is_internal_port(to)) {
 	int ret_val;
diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 7d4f52ee23..08265b590d 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -256,6 +256,7 @@ print_process_info(int to, void *to_arg, Process *p)
 		   p->current[1],
 		   p->current[2]);
     }
+    erts_print(to, to_arg, "Run queue: %d\n", erts_get_runq_proc(p)->ix);
 
     erts_print(to, to_arg, "Spawned by: %T\n", p->parent);
     approx_started = (time_t) p->approx_started;
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 05ac24e04d..90cd227fae 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -1873,8 +1873,8 @@ erts_alc_fatal_error(int error, int func, ErtsAlcType_t n, ...)
 	size = va_arg(argp, Uint);
 	va_end(argp);
 	erl_exit(1,
-		 "%s: Cannot %s %lu bytes of memory (of type \"%s\").\n",
-		 allctr_str, op, size, t_str);
+		 "%s: Cannot %s %lu bytes of memory (of type \"%s\", thread %d).\n",
+		 allctr_str, op, size, t_str, ERTS_ALC_GET_THR_IX());
 	break;
     }
     case ERTS_ALC_E_NOALLCTR:
diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
index 3cfa7a782f..9630e0cdf0 100644
--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
@@ -498,7 +498,11 @@ static void dbg_gen_printf(int onsyslog,int perr,int from_level,
 #ifdef HAVE_SYSLOG_H
       if (onsyslog)
 	{
-	  erts_vsnprintf(buf, DEBUG_BUFFER_SIZE, format, args);
+	  int len;
+	  len = erts_vsnprintf(buf, DEBUG_BUFFER_SIZE, format, args);
+	  if (perr != 0 && len < sizeof(buf)) {
+	      erts_snprintf(buf+len, sizeof(buf)-len, ": %s", strerror(perr));
+	  }
 	  syslog(LOG_ERR,"epmd: %s",buf);
 	}
 #endif
diff --git a/lib/mnesia/src/mnesia_loader.erl b/lib/mnesia/src/mnesia_loader.erl
index 4afbea1cc2..530317bcdd 100644
--- a/lib/mnesia/src/mnesia_loader.erl
+++ b/lib/mnesia/src/mnesia_loader.erl
@@ -208,7 +208,8 @@ do_get_network_copy(Tab, Reason, Ns, Storage, Cs) ->
 		    set({Tab, load_node}, Node),
 		    set({Tab, load_reason}, Reason),
 		    mnesia_controller:i_have_tab(Tab),
-		    dbg_out("Table ~p copied from ~p to ~p~n", [Tab, Node, node()]),
+		    dbg_out("Table ~p copied from ~p to ~p (~b entries)~n",
+                            [Tab, Node, node(), mnesia:table_info(Tab, size)]),
 		    {loaded, ok};
 		Err = {error, _} when element(1, Reason) == dumper ->
 		    {not_loaded,Err};