From: Simon Marlow <simonmar@microsoft.com>
Date: Tue, 29 Aug 2006 13:51:50 +0000 (+0000)
Subject: fix some rerrors in the worker counting
X-Git-Tag: Before_FC_branch_merge~107
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=7cb50e3aea11f934fd1430c5f056f4f0f93f1f23;p=ghc-hetmet.git

fix some rerrors in the worker counting
---

diff --git a/rts/win32/IOManager.c b/rts/win32/IOManager.c
index e69b8bc..993b1fb 100644
--- a/rts/win32/IOManager.c
+++ b/rts/win32/IOManager.c
@@ -220,10 +220,16 @@ IOWorkerProc(PVOID param)
 		free(work);
 	    } else {
 		fprintf(stderr, "unable to fetch work; fatal.\n"); fflush(stderr);
+		EnterCriticalSection(&iom->manLock);
+		ioMan->numWorkers--;
+		LeaveCriticalSection(&iom->manLock);
 		return 1;
 	    }
 	} else {
 	    fprintf(stderr, "waiting failed (%lu); fatal.\n", rc); fflush(stderr);
+	    EnterCriticalSection(&iom->manLock);
+	    ioMan->numWorkers--;
+	    LeaveCriticalSection(&iom->manLock);
 	    return 1;
 	}
     }
@@ -334,14 +340,12 @@ depositWorkItem( unsigned int reqID,
 	if ( (ioMan->workersIdle < ioMan->queueSize) ) {
 	    /* No, go ahead and create another. */
 	    ioMan->numWorkers++;
-	    LeaveCriticalSection(&ioMan->manLock);
-	    NewIOWorkerThread(ioMan);
-	} else {
-	    LeaveCriticalSection(&ioMan->manLock);
+	    if (NewIOWorkerThread(ioMan)) {
+		ioMan->numWorkers--;
+	    }
 	}
-    } else {
-	LeaveCriticalSection(&ioMan->manLock);
     }
+    LeaveCriticalSection(&ioMan->manLock);
   
     if (SubmitWork(ioMan->workQueue,wItem)) {
 	/* Note: the work item has potentially been consumed by a worker thread