celeron55
/
buildat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

server/state: Tweak synchronization to avoid deadlocks at shutdown

master
Perttu Ahola 2014-10-29 19:27:50 +02:00
parent 8244bac731
commit 8e1f9a252a
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/server/state.cpp
View File

@ -123,15 +123,16 @@ struct ModuleContainer
cs(info.name));
}
void thread_join(){
interface::MutexScope ms(mutex);
if(thread){
log_t(MODULE, "M[%s]: Container: Waiting thread to exit",
cs(info.name));
// But... having mutex locked can make this deadlock?
thread->join();
log_t(MODULE, "M[%s]: Container: Thread exited; deleting thread",
cs(info.name));
thread.reset();
{
interface::MutexScope ms(mutex);
thread.reset();
}
log_t(MODULE, "M[%s]: Container: Thread exited; thread deleted",
cs(info.name));
}