Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MGR: Fix possible deadlock when exiting manager 

svn path=/trunk/boinc/; revision=17603
This commit is contained in:
Charlie Fenton 2009-03-17 01:36:23 +00:00
parent 31ea2eee98
commit 737fe593bc
2 changed files with 13 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
checkin_notes
View File

@ -3059,3 +3059,9 @@ David 16 Mar 2009
sched/
sched_plan.cpp,h
sched_send.cpp
Charlie 16 Mar 2009
- MGR: Fix possible deadlock when exiting manager.
clientgui/
AsyncRPC.cpp

30
clientgui/AsyncRPC.cpp
View File

@ -135,29 +135,14 @@ void *RPCThread::Entry() {
// This does the following:
// (1) Unlocks the Mutex and puts the RPC thread to sleep as an atomic operation.
// (2) On Signal from main thread: locks Mutex again and wakes the RPC thread.
if (!m_pDoc->m_bShutDownRPCThread) {
condErr = m_pRPC_Thread_Condition->Wait();
wxASSERT(condErr == wxCOND_NO_ERROR);
condErr = m_pRPC_Thread_Condition->Wait();
wxASSERT(condErr == wxCOND_NO_ERROR);
if (m_pDoc->m_bShutDownRPCThread) {
Exit();
}
current_request = m_pDoc->GetCurrentRPCRequest();
// check if we were asked to exit
if (TestDestroy()) {
current_request->retval = retval;
current_request->isActive = false;
#if 0 //ndef __WXMSW__ // Deadlocks on Windows
// Use a critical section to prevent a crash during
// manager shutdown due to a rare race condition
m_pDoc->m_critsect.Enter();
m_pDoc->m_critsect.Leave();
#endif // !!__WXMSW__ // Deadlocks on Windows
return NULL;
}
if (m_pDoc->m_bShutDownRPCThread) continue;
if (!current_request->isActive) continue; // Should never happen
@ -609,11 +594,10 @@ void CMainDocument::KillRPCThread() {
return;
}
rpcClient.close();
m_bNeedRefresh = false;
m_bNeedTaskBarRefresh = false;
m_bShutDownRPCThread = true;
rpcClient.close(); // Abort any async RPC in progress (in case hung)
// On some platforms, Delete() takes effect only when thread calls TestDestroy()
// Wait for thread to unlock mutex with m_pRPC_Thread_Condition->Wait()
@ -623,8 +607,8 @@ void CMainDocument::KillRPCThread() {
mutexErr = m_pRPC_Thread_Mutex->Unlock(); // Release the mutex so thread can lock it
wxASSERT(mutexErr == wxMUTEX_NO_ERROR);
m_bShutDownRPCThread = true;
m_pRPC_Thread_Condition->Signal(); // Unblock the thread
m_RPCThread->Delete();
RPC_requests.clear();
current_rpc_request.clear();