1 files changed, 15 insertions, 18 deletions

diff --git a/erts/emulator/beam/erl_process_dump.c b/erts/emulator/beam/erl_process_dump.c
index 3550f1396c..ba74dfd6a1 100644
--- a/erts/emulator/beam/erl_process_dump.c
+++ b/erts/emulator/beam/erl_process_dump.c
@@ -60,19 +60,16 @@ extern BeamInstr beam_continue_exit[];
 void
 erts_deep_process_dump(int to, void *to_arg)
 {
-    int i;
+    int i, max = erts_ptab_max(&erts_proc);
 
     all_binaries = NULL;
     
-    for (i = 0; i < erts_max_processes; i++) {
-	if ((process_tab[i] != NULL) && (process_tab[i]->i != ENULL)) {
-	   if (process_tab[i]->status != P_EXITING) {
-	       Process* p = process_tab[i];
-
-	       if (p->status != P_GARBING) {
-		   dump_process_info(to, to_arg, p);
-	       }
-	   }
+    for (i = 0; i < max; i++) {
+	Process *p = erts_pix2proc(i);
+	if (p && p->i != ENULL) {
+	    erts_aint32_t state = erts_smp_atomic32_read_acqb(&p->state);
+	    if (!(state & (ERTS_PSFLG_EXITING|ERTS_PSFLG_GC)))
+		dump_process_info(to, to_arg, p);
        }
     }
 
@@ -88,8 +85,8 @@ dump_process_info(int to, void *to_arg, Process *p)
 
     ERTS_SMP_MSGQ_MV_INQ2PRIVQ(p);
 
-    if ((p->trace_flags & F_SENSITIVE) == 0 && p->msg.first) {
-	erts_print(to, to_arg, "=proc_messages:%T\n", p->id);
+    if ((ERTS_TRACE_FLAGS(p) & F_SENSITIVE) == 0 && p->msg.first) {
+	erts_print(to, to_arg, "=proc_messages:%T\n", p->common.id);
 	for (mp = p->msg.first; mp != NULL; mp = mp->next) {
 	    Eterm mesg = ERL_MESSAGE_TERM(mp);
 	    if (is_value(mesg))
@@ -103,21 +100,21 @@ dump_process_info(int to, void *to_arg, Process *p)
 	}
     }
 
-    if ((p->trace_flags & F_SENSITIVE) == 0) {
+    if ((ERTS_TRACE_FLAGS(p) & F_SENSITIVE) == 0) {
 	if (p->dictionary) {
-	    erts_print(to, to_arg, "=proc_dictionary:%T\n", p->id);
+	    erts_print(to, to_arg, "=proc_dictionary:%T\n", p->common.id);
 	    erts_deep_dictionary_dump(to, to_arg,
 				      p->dictionary, dump_element_nl);
 	}
     }
 
-    if ((p->trace_flags & F_SENSITIVE) == 0) {
-	erts_print(to, to_arg, "=proc_stack:%T\n", p->id);
+    if ((ERTS_TRACE_FLAGS(p) & F_SENSITIVE) == 0) {
+	erts_print(to, to_arg, "=proc_stack:%T\n", p->common.id);
 	for (sp = p->stop; sp < STACK_START(p); sp++) {
 	    yreg = stack_element_dump(to, to_arg, p, sp, yreg);
 	}
 
-	erts_print(to, to_arg, "=proc_heap:%T\n", p->id);
+	erts_print(to, to_arg, "=proc_heap:%T\n", p->common.id);
 	for (sp = p->stop; sp < STACK_START(p); sp++) {
 	    Eterm term = *sp;
 	    
@@ -326,7 +323,7 @@ heap_dump(int to, void *to_arg, Eterm x)
 		    int i;
 
 		    GET_DOUBLE_DATA((ptr+1), f);
-		    i = sys_double_to_chars(f.fd, (char*) sbuf);
+		    i = sys_double_to_chars(f.fd, (char*) sbuf, sizeof(sbuf));
 		    sys_memset(sbuf+i, 0, 31-i);
 		    erts_print(to, to_arg, "F%X:%s\n", i, sbuf);
 		    *ptr = OUR_NIL;