actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

cleanup, diags

Browse Source
This commit is contained in:
Glenn Maynard
2005-05-04 09:12:03 +00:00
parent 2a1114f8d9
commit b8688e20f7
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil_WorkerThread.cpp
+3 -2
View File
@@ -7,6 +7,7 @@ WorkerThread::WorkerThread( const CString &sName ):
m_WorkerEvent( "\"" + sName + "\" worker event" ), m_WorkerEvent( "\"" + sName + "\" worker event" ),
m_HeartbeatEvent( "\"" + sName + "\" heartbeat event" ) m_HeartbeatEvent( "\"" + sName + "\" heartbeat event" )
{ {
m_sName = sName;
m_Timeout.SetZero(); m_Timeout.SetZero();
m_iRequest = REQ_NONE; m_iRequest = REQ_NONE;
m_bTimedOut = false; m_bTimedOut = false;
@@ -49,7 +50,7 @@ void WorkerThread::StopThread()
m_WorkerEvent.Lock(); m_WorkerEvent.Lock();
if( m_bTimedOut ) if( m_bTimedOut )
{ {
LOG->Trace( "Waiting for timed-out fs \"%s\" to complete ...", m_WorkerThread.GetName().c_str() ); LOG->Trace( "Waiting for timed-out worker thread \"%s\" to complete ...", m_sName.c_str() );
while( m_bTimedOut ) while( m_bTimedOut )
m_WorkerEvent.Wait(); m_WorkerEvent.Wait();
} }
@@ -70,7 +71,7 @@ bool WorkerThread::DoRequest( int iRequest )
ASSERT( m_iRequest == REQ_NONE ); ASSERT( m_iRequest == REQ_NONE );
if( m_Timeout.IsZero() ) if( m_Timeout.IsZero() )
LOG->Warn( "Request made with timeout disabled" ); LOG->Warn( "Request made with timeout disabled (%s, iRequest = %i)", m_sName.c_str(), iRequest );
/* Set the request, and wake up the worker thread. */ /* Set the request, and wake up the worker thread. */
m_WorkerEvent.Lock(); m_WorkerEvent.Lock();
stepmania/src/RageUtil_WorkerThread.h
+1
View File
@@ -55,6 +55,7 @@ private:
enum { REQ_SHUTDOWN = -1, REQ_NONE = -2 }; enum { REQ_SHUTDOWN = -1, REQ_NONE = -2 };
RageThread m_WorkerThread; RageThread m_WorkerThread;
RageEvent m_WorkerEvent; RageEvent m_WorkerEvent;
CString m_sName;
int m_iRequest; int m_iRequest;
bool m_bRequestFinished; bool m_bRequestFinished;
bool m_bTimedOut; bool m_bTimedOut;