Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 02:16:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

deadlock 101

Browse source
This commit is contained in:
Atlante45 2015-12-10 14:14:20 -08:00
parent b65cdd2865
commit 09701fdcf1
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
assignment-client/src/octree/OctreeServer.cpp
View file

@ -1460,15 +1460,22 @@ void OctreeServer::didCallWriteDatagram(OctreeSendThread* thread) {
void OctreeServer::stopTrackingThread(OctreeSendThread* thread) { void OctreeServer::stopTrackingThread(OctreeSendThread* thread) {
QMutexLocker lockerA(&_threadsDidProcessMutex); {
QMutexLocker lockerB(&_threadsDidPacketDistributorMutex); QMutexLocker locker(&_threadsDidProcessMutex);
QMutexLocker lockerC(&_threadsDidHandlePacketSendMutex); _threadsDidProcess.remove(thread);
QMutexLocker lockerD(&_threadsDidCallWriteDatagramMutex); }
{
_threadsDidProcess.remove(thread); QMutexLocker locker(&_threadsDidPacketDistributorMutex);
_threadsDidPacketDistributor.remove(thread); _threadsDidPacketDistributor.remove(thread);
_threadsDidHandlePacketSend.remove(thread); }
_threadsDidCallWriteDatagram.remove(thread); {
QMutexLocker locker(&_threadsDidHandlePacketSendMutex);
_threadsDidHandlePacketSend.remove(thread);
}
{
QMutexLocker locker(&_threadsDidCallWriteDatagramMutex);
_threadsDidCallWriteDatagram.remove(thread);
}
} }
int howManyThreadsDidSomething(QMutex& mutex, QMap<OctreeSendThread*, quint64>& something, quint64 since) { int howManyThreadsDidSomething(QMutex& mutex, QMap<OctreeSendThread*, quint64>& something, quint64 since) {