summaryrefslogtreecommitdiff
path: root/rts/sm/NonMoving.c
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2020-03-10 22:55:19 -0400
committerBen Gamari <ben@smart-cactus.org>2020-10-30 00:41:14 -0400
commit4e4a73868488f83aa9d355d147e116408634c140 (patch)
tree7b54075262dcddb23db4cb1dbed9987857d5e6ba /rts/sm/NonMoving.c
parentd44f523208d32b599fa7e1260de32515d2ef9944 (diff)
downloadhaskell-4e4a73868488f83aa9d355d147e116408634c140.tar.gz
rts: Join to concurrent mark thread during shutdown
Previously we would take all capabilities but fail to join on the thread itself, potentially resulting in a leaked thread.
Diffstat (limited to 'rts/sm/NonMoving.c')
-rw-r--r--rts/sm/NonMoving.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/rts/sm/NonMoving.c b/rts/sm/NonMoving.c
index 388ceae2fd..3eafd6be98 100644
--- a/rts/sm/NonMoving.c
+++ b/rts/sm/NonMoving.c
@@ -726,6 +726,7 @@ void nonmovingStop(void)
"waiting for nonmoving collector thread to terminate");
ACQUIRE_LOCK(&concurrent_coll_finished_lock);
waitCondition(&concurrent_coll_finished, &concurrent_coll_finished_lock);
+ joinOSThread(mark_thread);
}
#endif
}