Merge branch 'rickard/process_info/OTP-14966'

* rickard/process_info/OTP-14966:
  Restore merge of signal queues in queue_messages() if main lock is held
  Fix message tracing

3 files changed, 19 insertions, 34 deletions

diff --git a/erts/emulator/beam/erl_gc.c b/erts/emulator/beam/erl_gc.c
index b498fd9cf9..0692cea0ee 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) && 1
+#if defined(DEBUG) && 0
 #  define HARDDEBUG 1
 #endif
 
@@ -223,23 +223,6 @@ ERTS_SCHED_PREF_QUICK_ALLOC_IMPL(gcireq,
                                  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.
  */
@@ -450,8 +433,6 @@ 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
@@ -895,11 +876,8 @@ do_major_collection:
 int
 erts_garbage_collect_nobump(Process* p, int need, Eterm* objv, int nobj, int 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);
+    int reds = garbage_collect(p, ERTS_INVALID_HFRAG_PTR, need, objv, nobj, fcalls, 0);
+    int 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);
@@ -909,9 +887,7 @@ 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;
-    ensure_sigq_roots_available(p);
-    reds = garbage_collect(p, ERTS_INVALID_HFRAG_PTR, need, objv, nobj, p->fcalls, 0);
+    int 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);
@@ -1137,8 +1113,6 @@ 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)))
diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index 34bd11d87c..8eae85ccdd 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -306,6 +306,9 @@ erts_queue_dist_message(Process *rcvr,
 
 	LINK_MESSAGE(rcvr, mp, &mp->next, 1);
 
+        if (rcvr_locks & ERTS_PROC_LOCK_MAIN)
+            erts_proc_sig_fetch(rcvr);
+
 	if (!(rcvr_locks & ERTS_PROC_LOCK_MSGQ))
 	    erts_proc_unlock(rcvr, ERTS_PROC_LOCK_MSGQ);
 
@@ -371,6 +374,9 @@ queue_messages(Process* receiver,
 
     LINK_MESSAGE(receiver, first, last, len);
 
+    if (receiver_locks & ERTS_PROC_LOCK_MAIN)
+        erts_proc_sig_fetch(receiver);
+
     if (locked_msgq) {
 	erts_proc_unlock(receiver, ERTS_PROC_LOCK_MSGQ);
     }
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c
index bcc4fc6d9b..2d59724aad 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -2391,8 +2391,9 @@ destroy_process_info_request(Process *c_p, ErtsProcessInfoSig *pisig)
 }
 
 static int
-handle_process_info(Process *c_p, ErtsMessage *sig,
-                    ErtsMessage ***next_nm_sig, int is_alive)
+handle_process_info(Process *c_p, ErtsSigRecvTracing *tracing,
+                    ErtsMessage *sig, ErtsMessage ***next_nm_sig,
+                    int is_alive)
 {
     ErtsProcessInfoSig *pisig = (ErtsProcessInfoSig *) sig;
     Uint reds = 0;
@@ -2416,7 +2417,11 @@ handle_process_info(Process *c_p, ErtsMessage *sig,
              * Move messages part of message queue into inner
              * signal queue...
              */
+            ASSERT(tracing);
+
             if (*next_nm_sig != &c_p->sig_qs.cont) {
+                if (*next_nm_sig == tracing->messages.next)
+                    tracing->messages.next = &c_p->sig_qs.cont;
                 *c_p->sig_qs.last = c_p->sig_qs.cont;
                 c_p->sig_qs.last = *next_nm_sig;
 
@@ -2877,7 +2882,7 @@ erts_proc_sig_handle_incoming(Process *c_p, erts_aint32_t *statep,
 
         case ERTS_SIG_Q_OP_PROCESS_INFO:
             ERTS_PROC_SIG_HDBG_PRIV_CHKQ(c_p, &tracing, next_nm_sig);
-            handle_process_info(c_p, sig, next_nm_sig, !0);
+            handle_process_info(c_p, &tracing, sig, next_nm_sig, !0);
             ERTS_PROC_SIG_HDBG_PRIV_CHKQ(c_p, &tracing, next_nm_sig);
             break;
 
@@ -3198,7 +3203,7 @@ erts_proc_sig_handle_exit(Process *c_p, int *redsp)
             break;
 
         case ERTS_SIG_Q_OP_PROCESS_INFO:
-            handle_process_info(c_p, sig, next_nm_sig, 0);
+            handle_process_info(c_p, NULL, sig, next_nm_sig, 0);
             break;
 
         case ERTS_SIG_Q_OP_TRACE_CHANGE_STATE: