1 files changed, 39 insertions, 9 deletions

diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index 5da8e3eda5..ea87cd7f50 100644
--- a/erts/emulator/beam/erl_gc.c
+++ b/erts/emulator/beam/erl_gc.c
@@ -61,7 +61,7 @@
 #  define ERTS_GC_ASSERT(B) ((void) 1)
 #endif
 
-#if defined(DEBUG) && 0
+#if defined(DEBUG) && 1
 #  define HARDDEBUG 1
 #endif
 
@@ -222,6 +222,24 @@ ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(gcireq,
                                  ErtsGCInfoReq,
                                  5,
                                  ERTS_ALC_T_GC_INFO_REQ)
+
+static ERTS_INLINE void
+ensure_sigq_roots_available(Process *p)
+{
+    ERTS_LC_ASSERT(ERTS_PROC_LOCK_MAIN == erts_proc_lc_my_proc_locks(p));
+    switch (p->flags & (F_OFF_HEAP_MSGQ|F_OFF_HEAP_MSGQ_CHNG)) {
+    case F_OFF_HEAP_MSGQ_CHNG:
+    case 0:
+        erts_proc_lock(p, ERTS_PROC_LOCK_MSGQ);
+        erts_proc_sig_fetch(p);
+        erts_proc_unlock(p, ERTS_PROC_LOCK_MSGQ);
+        break;
+    default:
+        break;
+    }
+}
+
+
 /*
  * Initialize GC global data.
  */
@@ -425,6 +443,8 @@ erts_gc_after_bif_call_lhf(Process* p, ErlHeapFragment *live_hf_end,
 	live_hf_end = ERTS_INVALID_HFRAG_PTR;
     }
 
+    ensure_sigq_roots_available(p);
+
     if (is_non_value(result)) {
 	if (p->freason == TRAP) {
 #ifdef HIPE
@@ -642,7 +662,7 @@ check_for_possibly_long_gc(Process *p, Uint ygen_usage)
     sz = ygen_usage;
     sz += p->hend - p->stop;
     if (p->flags & F_ON_HEAP_MSGQ)
-        sz += p->sig_qs.len;
+        sz += erts_proc_sig_privqs_len(p);
     if (major)
 	sz += p->old_htop - p->old_heap;
 
@@ -868,8 +888,11 @@ do_major_collection:
 int
 erts_garbage_collect_nobump(Process* p, int need, Eterm* objv, int nobj, int fcalls)
 {
-    int reds = garbage_collect(p, ERTS_INVALID_HFRAG_PTR, need, objv, nobj, fcalls, 0);
-    int reds_left = ERTS_REDS_LEFT(p, fcalls);
+    int reds; 
+    int reds_left;
+    ensure_sigq_roots_available(p);
+    reds = garbage_collect(p, ERTS_INVALID_HFRAG_PTR, need, objv, nobj, fcalls, 0);
+    reds_left = ERTS_REDS_LEFT(p, fcalls);
     if (reds > reds_left)
 	reds = reds_left;
     ASSERT(CONTEXT_REDS - (reds_left - reds) >= erts_proc_sched_data(p)->virtual_reds);
@@ -879,7 +902,9 @@ erts_garbage_collect_nobump(Process* p, int need, Eterm* objv, int nobj, int fca
 void
 erts_garbage_collect(Process* p, int need, Eterm* objv, int nobj)
 {
-    int reds = garbage_collect(p, ERTS_INVALID_HFRAG_PTR, need, objv, nobj, p->fcalls, 0);
+    int reds;
+    ensure_sigq_roots_available(p);
+    reds = garbage_collect(p, ERTS_INVALID_HFRAG_PTR, need, objv, nobj, p->fcalls, 0);
     BUMP_REDS(p, reds);
     ASSERT(CONTEXT_REDS - ERTS_BIF_REDS_LEFT(p)
 	   >= erts_proc_sched_data(p)->virtual_reds);
@@ -1105,6 +1130,8 @@ erts_garbage_collect_literals(Process* p, Eterm* literals,
      * First an ordinary major collection...
      */
 
+    ensure_sigq_roots_available(p);
+
     p->flags |= F_NEED_FULLSWEEP;
 
     if (ERTS_SCHEDULER_IS_DIRTY(erts_proc_sched_data(p)))
@@ -2541,14 +2568,17 @@ setup_rootset(Process *p, Eterm *objv, int nobj, Rootset *rootset)
 	break;
     case F_OFF_HEAP_MSGQ_CHNG:
     case 0: {
+        Sint len;
 	/*
 	 * We do not have off heap message queue enabled, i.e. we
-	 * need to add message queue to rootset...
+	 * need to add signal queues to rootset...
 	 */
 
+        len = erts_proc_sig_privqs_len(p);
+
 	/* Ensure large enough rootset... */
-	if (n + p->sig_qs.len > rootset->size) {
-	    Uint new_size = n + p->sig_qs.len;
+	if (n + len > rootset->size) {
+	    Uint new_size = n + len;
 	    ERTS_GC_ASSERT(roots == rootset->def);
 	    roots = erts_alloc(ERTS_ALC_T_ROOTSET,
 			       new_size*sizeof(Roots));
@@ -3448,7 +3478,7 @@ erts_max_heap_size_map(Sint max_heap_size, Uint max_heap_flags,
                        Eterm **hpp, Uint *sz)
 {
     if (!hpp) {
-        *sz += (2*3 + 1 + MAP_HEADER_FLATMAP_SZ);
+        *sz += ERTS_MAX_HEAP_SIZE_MAP_SZ;
         return THE_NON_VALUE;
     } else {
         Eterm *hp = *hpp;