Merge branch 'master' into sverker/enif_select

Conflicts:
	erts/emulator/beam/erl_binary.h
	erts/emulator/beam/erl_monitors.c
	erts/emulator/beam/erl_nif.c
	erts/emulator/beam/global.h
	erts/emulator/test/nif_SUITE_data/nif_SUITE.c

1 files changed, 21 insertions, 9 deletions

diff --git a/erts/emulator/beam/break.c b/erts/emulator/beam/break.c
index 5509c50a8e..787f1e4b7e 100644
--- a/erts/emulator/beam/break.c
+++ b/erts/emulator/beam/break.c
@@ -389,6 +389,16 @@ info(fmtfn_t to, void *to_arg)
 
 }
 
+static int code_size(struct erl_module_instance* modi)
+{
+    ErtsLiteralArea* lit = modi->code_hdr->literal_area;
+    int size = modi->code_length;
+    if (lit) {
+        size += (lit->end - lit->start) * sizeof(Eterm);
+    }
+    return size;
+}
+
 void
 loaded(fmtfn_t to, void *to_arg)
 {
@@ -409,9 +419,9 @@ loaded(fmtfn_t to, void *to_arg)
 	if ((modp = module_code(i, code_ix)) != NULL &&
 	    ((modp->curr.code_length != 0) ||
 	     (modp->old.code_length != 0))) {
-	    cur += modp->curr.code_length;
+	    cur += code_size(&modp->curr);
 	    if (modp->old.code_length != 0) {
-		old += modp->old.code_length;
+		old += code_size(&modp->old);
 	    }
 	}
     }
@@ -432,12 +442,12 @@ loaded(fmtfn_t to, void *to_arg)
 	    ((modp->curr.code_length != 0) ||
 	     (modp->old.code_length != 0))) {
 		erts_print(to, to_arg, "%T", make_atom(modp->module));
-		cur += modp->curr.code_length;
-		erts_print(to, to_arg, " %d", modp->curr.code_length );
+		cur += code_size(&modp->curr);
+		erts_print(to, to_arg, " %d", code_size(&modp->curr));
 		if (modp->old.code_length != 0) {
 		    erts_print(to, to_arg, " (%d old)",
-			       modp->old.code_length );
-		    old += modp->old.code_length;
+			       code_size(&modp->old));
+		    old += code_size(&modp->old);
 		}
 		erts_print(to, to_arg, "\n");
 	    }
@@ -452,7 +462,7 @@ loaded(fmtfn_t to, void *to_arg)
 		erts_print(to, to_arg, "%T", make_atom(modp->module));
 		erts_print(to, to_arg, "\n");
 		erts_print(to, to_arg, "Current size: %d\n",
-			   modp->curr.code_length);
+			   code_size(&modp->curr));
 		code = modp->curr.code_hdr;
 		if (code != NULL && code->attr_ptr) {
 		    erts_print(to, to_arg, "Current attributes: ");
@@ -466,7 +476,7 @@ loaded(fmtfn_t to, void *to_arg)
 		}
 
 		if (modp->old.code_length != 0) {
-		    erts_print(to, to_arg, "Old size: %d\n", modp->old.code_length);
+		    erts_print(to, to_arg, "Old size: %d\n", code_size(&modp->old));
 		    code = modp->old.code_hdr;
 		    if (code->attr_ptr) {
 			erts_print(to, to_arg, "Old attributes: ");
@@ -657,7 +667,7 @@ bin_check(void)
 		erts_printf("%p orig_size: %bpd, norefs = %bpd\n",
 			    bp->val, 
 			    bp->val->orig_size, 
-			    erts_smp_atomic_read_nob(&bp->val->refc));
+			    erts_refc_read(&bp->val->refc, 1));
 	    }
 	}
 	if (printed) {
@@ -727,6 +737,8 @@ erl_crash_dump_v(char *file, int line, char* fmt, va_list args)
      * We have to be very very careful when doing this as the schedulers
      * could be anywhere.
      */
+    sys_init_suspend_handler();
+
     for (i = 0; i < erts_no_schedulers; i++) {
         erts_tid_t tid = ERTS_SCHEDULER_IX(i)->tid;
         if (!erts_equal_tids(tid,erts_thr_self()))