Skip to content

Commit 2fe35d6

Browse files
committed
Revert "Merge branch 'rickard/sig-cleanup/OTP-18752' into maint-25"
This reverts commit 9ed5c42, reversing changes made to 96cd1d8.
1 parent d3c9eeb commit 2fe35d6

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

erts/emulator/beam/erl_proc_sig_queue.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6489,7 +6489,6 @@ int
64896489
erts_proc_sig_handle_exit(Process *c_p, Sint *redsp,
64906490
ErtsProcExitContext *pe_ctxt_p)
64916491
{
6492-
int yield = 0;
64936492
int cnt;
64946493
Sint limit;
64956494
ErtsMessage *sig, ***next_nm_sig;
@@ -6634,11 +6633,12 @@ erts_proc_sig_handle_exit(Process *c_p, Sint *redsp,
66346633
handle_sync_suspend(c_p, sig);
66356634
break;
66366635

6637-
case ERTS_SIG_Q_OP_RPC:
6638-
yield = 0;
6639-
cnt += handle_rpc(c_p, (ErtsProcSigRPC *) sig,
6640-
cnt, limit, &yield);
6636+
case ERTS_SIG_Q_OP_RPC: {
6637+
int yield = 0;
6638+
handle_rpc(c_p, (ErtsProcSigRPC *) sig,
6639+
cnt, limit, &yield);
66416640
break;
6641+
}
66426642

66436643
case ERTS_SIG_Q_OP_DIST_SPAWN_REPLY: {
66446644
cnt += handle_dist_spawn_reply_exiting(c_p, sig, pe_ctxt_p);
@@ -6684,7 +6684,7 @@ erts_proc_sig_handle_exit(Process *c_p, Sint *redsp,
66846684
break;
66856685
}
66866686

6687-
} while (cnt <= limit && !yield && *next_nm_sig);
6687+
} while (cnt >= limit && *next_nm_sig);
66886688

66896689
*redsp += cnt / ERTS_SIG_REDS_CNT_FACTOR;
66906690

0 commit comments

Comments
 (0)