winio: Add IOPort synchronization primitive

1 files changed, 10 insertions, 6 deletions

diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c
index e8a6a81747..719c05435d 100644
--- a/rts/RaiseAsync.c
+++ b/rts/RaiseAsync.c
@@ -174,11 +174,11 @@ throwToSelf (Capability *cap, StgTSO *tso, StgClosure *exception)
 
      - or it is masking exceptions (TSO_BLOCKEX)
 
-   Currently, if the target is BlockedOnMVar, BlockedOnSTM, or
-   BlockedOnBlackHole then we acquire ownership of the TSO by locking
-   its parent container (e.g. the MVar) and then raise the exception.
-   We might change these cases to be more message-passing-like in the
-   future.
+   Currently, if the target is BlockedOnMVar, BlockedOnSTM,
+   BlockedOnIOCompletion or BlockedOnBlackHole then we acquire ownership of the
+   TSO by locking its parent container (e.g. the MVar) and then raise the
+   exception.  We might change these cases to be more message-passing-like in
+   the future.
 
    Returns:
 
@@ -343,6 +343,7 @@ check_target:
 
     case BlockedOnMVar:
     case BlockedOnMVarRead:
+    case BlockedOnIOCompletion:
     {
         /*
           To establish ownership of this TSO, we need to acquire a
@@ -367,7 +368,9 @@ check_target:
 
         // we have the MVar, let's check whether the thread
         // is still blocked on the same MVar.
-        if ((target->why_blocked != BlockedOnMVar && target->why_blocked != BlockedOnMVarRead)
+        if ((target->why_blocked != BlockedOnMVar
+             && target->why_blocked != BlockedOnMVarRead
+             && target->why_blocked != BlockedOnIOCompletion)
             || (StgMVar *)target->block_info.closure != mvar) {
             unlockClosure((StgClosure *)mvar, info);
             goto retry;
@@ -679,6 +682,7 @@ removeFromQueues(Capability *cap, StgTSO *tso)
 
   case BlockedOnMVar:
   case BlockedOnMVarRead:
+  case BlockedOnIOCompletion:
       removeFromMVarBlockedQueue(tso);
       goto done;