aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2017-11-16 14:06:24 +0100
committerRickard Green <[email protected]>2017-11-16 14:06:24 +0100
commitaa449ea20952d6a4d71718bac0b1be6dd45d8201 (patch)
tree6b59542eb107cf8072e581a62a12aad2747200ef
parent70defe957f68f5ad4a4957af29c8713556074995 (diff)
parent19e8943798f8ef282a8c2b4da26176f07c3652d5 (diff)
downloadotp-aa449ea20952d6a4d71718bac0b1be6dd45d8201.tar.gz
otp-aa449ea20952d6a4d71718bac0b1be6dd45d8201.tar.bz2
otp-aa449ea20952d6a4d71718bac0b1be6dd45d8201.zip
Merge branch 'rickard/node-mon-proc-exit-race/OTP-14781' into maint
* rickard/node-mon-proc-exit-race/OTP-14781: Fix triggering of node monitors
-rw-r--r--erts/emulator/beam/dist.c34
1 files changed, 18 insertions, 16 deletions
diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
index 09fdb897f5..9fddac8980 100644
--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
@@ -385,22 +385,24 @@ static void doit_node_link_net_exits(ErtsLink *lnk, void *vnecp)
if (!rp)
goto done;
erts_smp_proc_lock(rp, rp_locks);
- rlnk = erts_remove_link(&ERTS_P_LINKS(rp), name);
- if (rlnk != NULL) {
- ASSERT(is_atom(rlnk->pid) && (rlnk->type == LINK_NODE));
- erts_destroy_link(rlnk);
- }
- n = ERTS_LINK_REFC(lnk);
- for (i = 0; i < n; ++i) {
- Eterm tup;
- Eterm *hp;
- ErtsMessage *msgp;
-
- msgp = erts_alloc_message_heap(rp, &rp_locks,
- 3, &hp, &ohp);
- tup = TUPLE2(hp, am_nodedown, name);
- erts_queue_message(rp, rp_locks, msgp, tup, am_system);
- }
+ if (!ERTS_PROC_IS_EXITING(rp)) {
+ rlnk = erts_remove_link(&ERTS_P_LINKS(rp), name);
+ if (rlnk != NULL) {
+ ASSERT(is_atom(rlnk->pid) && (rlnk->type == LINK_NODE));
+ erts_destroy_link(rlnk);
+ }
+ n = ERTS_LINK_REFC(lnk);
+ for (i = 0; i < n; ++i) {
+ Eterm tup;
+ Eterm *hp;
+ ErtsMessage *msgp;
+
+ msgp = erts_alloc_message_heap(rp, &rp_locks,
+ 3, &hp, &ohp);
+ tup = TUPLE2(hp, am_nodedown, name);
+ erts_queue_message(rp, rp_locks, msgp, tup, am_system);
+ }
+ }
erts_smp_proc_unlock(rp, rp_locks);
}
done: