update.

cmu-pasta · Jul 17, 2024 · 5ee8b10 · 5ee8b10
1 parent d476821
commit 5ee8b10
Show file tree

Hide file tree

Showing 4 changed files with 635 additions and 12 deletions.
diff --git a/core/src/main/kotlin/cmu/pasta/fray/core/GlobalContext.kt b/core/src/main/kotlin/cmu/pasta/fray/core/GlobalContext.kt
@@ -829,7 +829,9 @@ object GlobalContext {
             currentThread.state == ThreadState.Completed)
     assert(registeredThreads.none { it.value.state == ThreadState.Running })
 
-    if (terminatingThread.contains(currentThread.index)) {
+    if (terminatingThread.contains(currentThread.index) &&
+        !currentThread.isExiting &&
+        !(Thread.currentThread() is HelperThread)) {
       currentThread.state = ThreadState.Running
       terminatingThread.remove(currentThread.index)
       throw DeadlockException()