Merge branch 'sverker/sig-msg-notify-bug'

3 files changed, 60 insertions, 35 deletions

diff --git a/erts/emulator/beam/erl_message.c b/erts/emulator/beam/erl_message.c
index bea7a0fe86..507cc989d2 100644
--- a/erts/emulator/beam/erl_message.c
+++ b/erts/emulator/beam/erl_message.c
@@ -379,7 +379,10 @@ queue_messages(Process* receiver,
 	erts_proc_unlock(receiver, ERTS_PROC_LOCK_MSGQ);
     }
 
-    erts_proc_notify_new_message(receiver, receiver_locks);
+    if (last == &first->next)
+        erts_proc_notify_new_message(receiver, receiver_locks);
+    else
+        erts_proc_notify_new_sig(receiver, state, ERTS_PSFLG_ACTIVE);
 }
 
 static ERTS_INLINE
diff --git a/erts/emulator/beam/erl_proc_sig_queue.c b/erts/emulator/beam/erl_proc_sig_queue.c
index 5165cd22a5..6d81044c39 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.c
+++ b/erts/emulator/beam/erl_proc_sig_queue.c
@@ -519,41 +519,42 @@ erts_aint32_t erts_enqueue_signals(Process *rp, ErtsMessage *first,
     return enqueue_signals(rp, first, last, last_next, num_msgs, in_state);
 }
 
-static ERTS_INLINE void
-ensure_dirty_proc_handled(Eterm pid,
-                          erts_aint32_t state,
-                          erts_aint32_t prio)
+void
+erts_make_dirty_proc_handled(Eterm pid,
+                             erts_aint32_t state,
+                             erts_aint32_t prio)
 {
-    if (state & (ERTS_PSFLG_DIRTY_RUNNING
-                 | ERTS_PSFLG_DIRTY_RUNNING_SYS)) {
-        Eterm *hp;
-        ErtsMessage *mp;
-        Process *sig_handler;
+    Eterm *hp;
+    ErtsMessage *mp;
+    Process *sig_handler;
 
-        if (prio < 0)
-            prio = (int) ERTS_PSFLGS_GET_USR_PRIO(state);
+    ASSERT(state & (ERTS_PSFLG_DIRTY_RUNNING |
+                    ERTS_PSFLG_DIRTY_RUNNING_SYS));
 
-        switch (prio) {
-        case PRIORITY_MAX:
-            sig_handler = erts_dirty_process_signal_handler_max;
-            break;
-        case PRIORITY_HIGH:
-            sig_handler = erts_dirty_process_signal_handler_high;
-            break;
-        default:
-            sig_handler = erts_dirty_process_signal_handler;
-            break;
-        }
+    if (prio < 0)
+        prio = (int) ERTS_PSFLGS_GET_USR_PRIO(state);
 
-        /* Make sure signals are handled... */
-        mp = erts_alloc_message(0, &hp);
-        erts_queue_message(sig_handler, 0, mp, pid, am_system);
+    switch (prio) {
+    case PRIORITY_MAX:
+        sig_handler = erts_dirty_process_signal_handler_max;
+        break;
+    case PRIORITY_HIGH:
+        sig_handler = erts_dirty_process_signal_handler_high;
+        break;
+    default:
+        sig_handler = erts_dirty_process_signal_handler;
+        break;
     }
+
+    /* Make sure signals are handled... */
+    mp = erts_alloc_message(0, &hp);
+    erts_queue_message(sig_handler, 0, mp, pid, am_system);
 }
 
 static void
 check_push_msgq_len_offs_marker(Process *rp, ErtsSignal *sig);
 
+
 static int
 proc_queue_signal(Process *c_p, Eterm pid, ErtsSignal *sig, int op)
 {
@@ -679,14 +680,7 @@ first_last_done:
         sig_enqueue_trace_cleanup(first, sig, last);
     }
 
-    if (!(state & (ERTS_PSFLG_EXITING
-                   | ERTS_PSFLG_ACTIVE_SYS
-                   | ERTS_PSFLG_SIG_IN_Q))) {
-        /* Schedule process... */
-        state = erts_proc_sys_schedule(rp, state, 0);
-    }
-
-    ensure_dirty_proc_handled(rp->common.id, state, -1);
+    erts_proc_notify_new_sig(rp, state, 0);
 
     if (!is_normal_sched)
         erts_proc_dec_refc(rp);
@@ -742,7 +736,10 @@ maybe_elevate_sig_handling_prio(Process *c_p, Eterm other)
             if (res) {
                 /* ensure handled if dirty executing... */
                 state = erts_atomic32_read_nob(&rp->state);
-                ensure_dirty_proc_handled(other, state, my_prio);
+                if (state & (ERTS_PSFLG_DIRTY_RUNNING
+                             | ERTS_PSFLG_DIRTY_RUNNING_SYS)) {
+                    erts_make_dirty_proc_handled(other, state, my_prio);
+                }
             }
         }
     }
diff --git a/erts/emulator/beam/erl_proc_sig_queue.h b/erts/emulator/beam/erl_proc_sig_queue.h
index 8b7cd35f61..8edd277309 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.h
+++ b/erts/emulator/beam/erl_proc_sig_queue.h
@@ -744,6 +744,13 @@ erts_enqueue_signals(Process *rp, ErtsMessage *first,
 void
 erts_proc_sig_send_pending(ErtsSchedulerData* esdp);
 
+/* SVERK Doc me up! */
+ERTS_GLB_INLINE void erts_proc_notify_new_sig(Process* rp, erts_aint32_t state,
+                                              erts_aint32_t enable_flag);
+
+void erts_make_dirty_proc_handled(Eterm pid, erts_aint32_t state,
+                                  erts_aint32_t prio);
+
 
 typedef struct {
     Uint size;
@@ -879,6 +886,24 @@ erts_proc_sig_fetch(Process *proc)
     return res;
 }
 
+ERTS_GLB_INLINE void
+erts_proc_notify_new_sig(Process* rp, erts_aint32_t state,
+                         erts_aint32_t enable_flag)
+{
+    if (~(state & (ERTS_PSFLG_EXITING
+                   | ERTS_PSFLG_ACTIVE_SYS
+                   | ERTS_PSFLG_SIG_IN_Q))
+        | (~state & enable_flag)) {
+        /* Schedule process... */
+        state = erts_proc_sys_schedule(rp, state, enable_flag);
+    }
+
+    if (state & (ERTS_PSFLG_DIRTY_RUNNING
+                 | ERTS_PSFLG_DIRTY_RUNNING_SYS)) {
+        erts_make_dirty_proc_handled(rp->common.id, state, -1);
+    }
+}
+
 #endif /* ERTS_GLB_INLINE_INCL_FUNC_DEF */
 
 #endif /* ERTS_PROC_SIG_QUEUE_H__ */