Join worker threads in END-KERNEL

sharplispers · Mar 10, 2024 · 0e80147 · 0e80147
1 parent 6950400
commit 0e80147
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/src/kernel/core.lisp b/src/kernel/core.lisp
@@ -448,13 +448,17 @@ deadlocked or infinite looping tasks."
       (when (alivep kernel)
         (let ((channel (let ((*kernel* kernel)) (make-channel)))
               (threads (map 'list #'thread (workers kernel))))
-          (cond (wait
-                 (shutdown channel kernel)
-                 threads)
-                (t
-                 (cons (with-thread (:name "lparallel kernel shutdown manager")
-                         (shutdown channel kernel))
-                       threads))))))))
+          (flet ((shutdown-kernel-and-threads ()
+                   (shutdown channel kernel)
+                   (alexandria:ignore-some-conditions (bt2:abnormal-exit)
+                     (map nil #'bt2:join-thread threads))))
+            (cond (wait
+                   (shutdown-kernel-and-threads)
+                   threads)
+                  (t
+                   (cons (with-thread (:name "lparallel kernel shutdown manager")
+                           (shutdown-kernel-and-threads))
+                         threads)))))))))
 
 (defun task-categories-running ()
   "Return a vector containing the task category currently running for