Fix erts_try_lock_sig_free_proc()

2 files changed, 27 insertions, 22 deletions

diff --git a/erts/emulator/beam/erl_bif_info.c b/erts/emulator/beam/erl_bif_info.c
index 8f04ff7353..55450e397f 100644
--- a/erts/emulator/beam/erl_bif_info.c
+++ b/erts/emulator/beam/erl_bif_info.c
@@ -1160,6 +1160,7 @@ process_info_bif(Process *c_p, Eterm pid, Eterm opt, int always_wrap, int pi2)
     else {
         if (flags & ERTS_PI_FLAG_FORCE_SIG_SEND)
             goto send_signal;
+        state = ERTS_PSFLG_RUNNING; /* fail state... */
         rp = erts_try_lock_sig_free_proc(pid, locks, &state);
         if (!rp)
             goto undefined;
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index f3e77df2fd..b373d08a6b 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -8656,6 +8656,13 @@ erts_internal_suspend_process_2(BIF_ALIST_2)
         Process *rp;
         int send_sig = 0;
 
+        /* fail state... */
+        state = (ERTS_PSFLG_EXITING
+                 | ERTS_PSFLG_RUNNING
+                 | ERTS_PSFLG_RUNNING_SYS
+                 | ERTS_PSFLG_DIRTY_RUNNING
+                 | ERTS_PSFLG_DIRTY_RUNNING_SYS);
+
         rp = erts_try_lock_sig_free_proc(BIF_ARG_1,
                                          ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS,
                                          &state);
@@ -8663,16 +8670,7 @@ erts_internal_suspend_process_2(BIF_ALIST_2)
             goto noproc;
         if (rp == ERTS_PROC_LOCK_BUSY)
             send_sig = !0;
-        else if (state & (ERTS_PSFLG_EXITING
-                          | ERTS_PSFLG_RUNNING
-                          | ERTS_PSFLG_RUNNING_SYS
-                          | ERTS_PSFLG_DIRTY_RUNNING
-                          | ERTS_PSFLG_DIRTY_RUNNING_SYS)) {
-            erts_proc_unlock(rp, ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_STATUS);
-            send_sig = !0;
-        }
-
-        if (!send_sig && rp) {
+        else {
             send_sig = !suspend_process(BIF_P, rp);
             if (!send_sig) {
                 erts_monitor_list_insert(&ERTS_P_LT_MONITORS(rp), &mdp->target);
@@ -12497,7 +12495,13 @@ erts_try_lock_sig_free_proc(Eterm pid, ErtsProcLocks locks,
                             erts_aint32_t *statep)
 {
     Process *rp = erts_proc_lookup_raw(pid);
+    erts_aint32_t fail_state = ERTS_PSFLG_SIG_IN_Q|ERTS_PSFLG_SIG_Q;
     erts_aint32_t state;
+    ErtsProcLocks tmp_locks = ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_MSGQ;
+
+    tmp_locks |= locks;
+    if (statep)
+        fail_state |= *statep;
 
     if (!rp) {
         if (statep)
@@ -12514,28 +12518,28 @@ erts_try_lock_sig_free_proc(Eterm pid, ErtsProcLocks locks,
     if (state & ERTS_PSFLG_FREE)
         return NULL;
 
-    if (state & (ERTS_PSFLG_SIG_IN_Q|ERTS_PSFLG_SIG_Q))
+    if (state & fail_state)
         return ERTS_PROC_LOCK_BUSY;
 
-    if (!locks)
-        return rp;
-
-    if (erts_proc_trylock(rp, locks) == EBUSY)
+    if (erts_proc_trylock(rp, tmp_locks) == EBUSY)
         return ERTS_PROC_LOCK_BUSY;
 
     state = erts_atomic32_read_nob(&rp->state);
     if (statep)
         *statep = state;
 
-    if (state & ERTS_PSFLG_FREE) {
-        erts_proc_unlock(rp, locks);
-        return NULL;
+    if ((state & fail_state)
+        || rp->sig_inq.first
+        || rp->sig_qs.cont) {
+        erts_proc_unlock(rp, tmp_locks);
+        if (state & ERTS_PSFLG_FREE)
+            return NULL;
+        else
+            return ERTS_PROC_LOCK_BUSY;
     }
 
-    if (state & (ERTS_PSFLG_SIG_IN_Q|ERTS_PSFLG_SIG_Q)) {
-        erts_proc_unlock(rp, locks);
-        return ERTS_PROC_LOCK_BUSY;
-    }
+    if (tmp_locks != locks)
+        erts_proc_unlock(rp, tmp_locks & ~locks);
 
     return rp;
 }