X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fwin32%2FAsyncIO.c;h=8662e2a3690cc96a4545e9777577634431cf611e;hb=653e325e08c5f632aa194f9239e938faca5abba5;hp=3f99113b7fd8411851a630e9a5885c13e2923943;hpb=610de7d17e09318272b7516bd9b97e8b2cbd170c;p=ghc-hetmet.git

diff --git a/rts/win32/AsyncIO.c b/rts/win32/AsyncIO.c
index 3f99113..8662e2a 100644
--- a/rts/win32/AsyncIO.c
+++ b/rts/win32/AsyncIO.c
@@ -4,12 +4,14 @@
  *
  * (c) sof, 2002-2003.
  */
+
+#if !defined(THREADED_RTS)
+
 #include "Rts.h"
 #include "RtsUtils.h"
 #include <windows.h>
 #include <stdio.h>
 #include "Schedule.h"
-#include "RtsFlags.h"
 #include "Capability.h"
 #include "win32/AsyncIO.h"
 #include "win32/IOManager.h"
@@ -171,8 +173,9 @@ startupAsyncIO()
 }
 
 void
-shutdownAsyncIO()
+shutdownAsyncIO(rtsBool wait_threads)
 {
+    ShutdownIOManager(wait_threads);
     if (completed_req_event != INVALID_HANDLE_VALUE) {
         CloseHandle(completed_req_event);
 	completed_req_event = INVALID_HANDLE_VALUE;
@@ -185,7 +188,7 @@ shutdownAsyncIO()
         CloseHandle(completed_table_sema);
 	completed_table_sema = NULL;
     }
-    ShutdownIOManager();
+    DeleteCriticalSection(&queue_lock);
 }
 
 /*
@@ -271,8 +274,21 @@ start:
 	    unsigned int rID = completedTable[i].reqID;
 	    
 	    prev = NULL;
-	    for(tso = blocked_queue_hd ; tso != END_TSO_QUEUE; prev = tso, tso = tso->link) {
+	    for(tso = blocked_queue_hd ; tso != END_TSO_QUEUE; tso = tso->_link) {
 	
+                if (tso->what_next == ThreadRelocated) {
+                    /* Drop the TSO from blocked_queue */
+                    if (prev) {
+                        setTSOLink(&MainCapability, prev, tso->_link);
+                    } else {
+                        blocked_queue_hd = tso->_link;
+                    }
+                    if (blocked_queue_tl == tso) {
+                        blocked_queue_tl = prev ? prev : END_TSO_QUEUE;
+                    }
+                    continue;
+                }
+
 		switch(tso->why_blocked) {
 		case BlockedOnRead:
 		case BlockedOnWrite:
@@ -286,16 +302,16 @@ start:
 			
 			/* Drop the matched TSO from blocked_queue */
 			if (prev) {
-			    prev->link = tso->link;
+			    setTSOLink(&MainCapability, prev, tso->_link);
 			} else {
-			    blocked_queue_hd = tso->link;
+			    blocked_queue_hd = tso->_link;
 			}
 			if (blocked_queue_tl == tso) {
 			    blocked_queue_tl = prev ? prev : END_TSO_QUEUE;
 			}
 		    
 			/* Terminates the run queue + this inner for-loop. */
-			tso->link = END_TSO_QUEUE;
+			tso->_link = END_TSO_QUEUE;
 			tso->why_blocked = NotBlocked;
 			pushOnRunQueue(&MainCapability, tso);
 			break;
@@ -307,6 +323,8 @@ start:
 		    }
 		    break;
 		}
+
+                prev = tso;
 	    }
 	    /* Signal that there's completed table slots available */
 	    if ( !ReleaseSemaphore(completed_table_sema, 1, NULL) ) {
@@ -354,3 +372,4 @@ resetAbandonRequestWait( void )
     ResetEvent(abandon_req_wait);
 }
 
+#endif /* !defined(THREADED_RTS) */