fix REQ_SHUTDOWN, thread name

This commit is contained in:
Glenn Maynard
2005-02-05 09:08:05 +00:00
parent 4d7f4e4cdd
commit 69a175f001
+5 -4
View File
@@ -11,7 +11,7 @@ WorkerThread::WorkerThread( const CString &sName ):
m_fHeartbeat = -1; m_fHeartbeat = -1;
m_bRequestFinished = false; m_bRequestFinished = false;
m_WorkerThread.SetName( "ThreadedFileWorker fileset worker \"" + sName + "\"" ); m_WorkerThread.SetName( "ThreadedFileWorker " + sName + " worker" );
} }
WorkerThread::~WorkerThread() WorkerThread::~WorkerThread()
@@ -117,9 +117,6 @@ void WorkerThread::WorkerMain()
m_WorkerEvent.Unlock(); m_WorkerEvent.Unlock();
if( iRequest == REQ_SHUTDOWN )
break;
/* If it's time to run a heartbeat, do so. */ /* If it's time to run a heartbeat, do so. */
if( bTimeToRunHeartbeat ) if( bTimeToRunHeartbeat )
{ {
@@ -132,6 +129,7 @@ void WorkerThread::WorkerMain()
if( iRequest != REQ_NONE ) if( iRequest != REQ_NONE )
{ {
/* Handle the request. */ /* Handle the request. */
if( iRequest != REQ_SHUTDOWN )
HandleRequest( iRequest ); HandleRequest( iRequest );
/* Lock the mutex, to keep DoRequest where it is (if it's still running). */ /* Lock the mutex, to keep DoRequest where it is (if it's still running). */
@@ -160,6 +158,9 @@ void WorkerThread::WorkerMain()
m_WorkerEvent.Unlock(); m_WorkerEvent.Unlock();
} }
} }
if( iRequest == REQ_SHUTDOWN )
break;
} }
} }