X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fwin32%2FAsyncIO.c;h=6fb9a2b22d01383958db5806f5020dd5f1194b71;hb=bbc583766a08678d03740354bed216e268306356;hp=cd0cf38bab2a176b75051a7e3410eaa29a8cf80f;hpb=de6c8e5293c9ef68b597ab2e6d55c3f42a283489;p=ghc-hetmet.git

diff --git a/rts/win32/AsyncIO.c b/rts/win32/AsyncIO.c
index cd0cf38..6fb9a2b 100644
--- a/rts/win32/AsyncIO.c
+++ b/rts/win32/AsyncIO.c
@@ -174,9 +174,9 @@ startupAsyncIO()
 }
 
 void
-shutdownAsyncIO()
+shutdownAsyncIO(rtsBool wait_threads)
 {
-    ShutdownIOManager();
+    ShutdownIOManager(wait_threads);
     if (completed_req_event != INVALID_HANDLE_VALUE) {
         CloseHandle(completed_req_event);
 	completed_req_event = INVALID_HANDLE_VALUE;
@@ -189,6 +189,7 @@ shutdownAsyncIO()
         CloseHandle(completed_table_sema);
 	completed_table_sema = NULL;
     }
+    DeleteCriticalSection(&queue_lock);
 }
 
 /*
@@ -274,7 +275,7 @@ 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; prev = tso, tso = tso->_link) {
 	
 		switch(tso->why_blocked) {
 		case BlockedOnRead:
@@ -289,16 +290,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;