Commit b2bc3ad7 authored by simonmar's avatar simonmar

[project @ 2004-03-15 12:32:11 by simonmar]

Sync up with the stable branch (small change to the way worker threads
exit that sneaked onto the branch by mistake).
parent 00912bda
......@@ -70,6 +70,11 @@ IOWorkerProc(PVOID param)
*/
rc = WaitForMultipleObjects( 2, hWaits, FALSE, INFINITE );
if (rc == WAIT_OBJECT_0) {
// we received the exit event
return 0;
}
EnterCriticalSection(&iom->manLock);
/* Signal that the thread is 'non-idle' and about to consume
* a work item.
......@@ -78,10 +83,7 @@ IOWorkerProc(PVOID param)
iom->queueSize--;
LeaveCriticalSection(&iom->manLock);
if ( WAIT_OBJECT_0 == rc ) {
/* shutdown */
return 0;
} else if ( (WAIT_OBJECT_0 + 1) == rc ) {
if ( rc == (WAIT_OBJECT_0 + 1) ) {
/* work item available, fetch it. */
if (FetchWork(pq,(void**)&work)) {
if ( work->workKind & WORKER_READ ) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment