From 827b96ae2d657905ada2ec49de1f0b863cf83401 Mon Sep 17 00:00:00 2001
From: Sverker Eriksson <sverker@erlang.org>
Date: Tue, 15 May 2018 20:58:28 +0200
Subject: erts: Fix bug when scheduling monitor-msg combo

Bug introduced in master by
613cde66c25464121f2f6dace99782bad0e07d9b
---
 erts/emulator/beam/erl_proc_sig_queue.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'erts/emulator/beam/erl_proc_sig_queue.h')

diff --git a/erts/emulator/beam/erl_proc_sig_queue.h b/erts/emulator/beam/erl_proc_sig_queue.h
index 3ea6418283..8edd277309 100644
--- a/erts/emulator/beam/erl_proc_sig_queue.h
+++ b/erts/emulator/beam/erl_proc_sig_queue.h
@@ -744,6 +744,10 @@ 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);
 
@@ -882,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__ */
-- 
cgit v1.2.3