Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 09:45:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove _process mutex since it's no longer needed

Browse source
This commit is contained in:
ZappoMan 2014-03-31 15:28:13 -07:00
parent 27f42b5b86
commit a9d153054f
2 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
assignment-client/src/octree/OctreeSendThread.cpp
View file

@ -26,7 +26,6 @@ OctreeSendThread::OctreeSendThread(const SharedAssignmentPointer& myAssignment,
_nodeUUID(node->getUUID()), _nodeUUID(node->getUUID()),
_packetData(), _packetData(),
_nodeMissingCount(0), _nodeMissingCount(0),
_processLock(),
_isShuttingDown(false) _isShuttingDown(false)
{ {
qDebug() << qPrintable(_myServer->getMyServerName()) << "server [" << _myServer << "]: client connected " qDebug() << qPrintable(_myServer->getMyServerName()) << "server [" << _myServer << "]: client connected "
@ -61,9 +60,6 @@ OctreeSendThread::~OctreeSendThread() {
void OctreeSendThread::setIsShuttingDown() { void OctreeSendThread::setIsShuttingDown() {
_isShuttingDown = true; _isShuttingDown = true;
OctreeServer::stopTrackingThread(this); OctreeServer::stopTrackingThread(this);
// this will cause us to wait till the process loop is complete, we do this after we change _isShuttingDown
QMutexLocker locker(&_processLock);
} }
@ -79,13 +75,6 @@ bool OctreeSendThread::process() {
OctreeServer::didProcess(this); OctreeServer::didProcess(this);
float lockWaitElapsedUsec = OctreeServer::SKIP_TIME;
quint64 lockWaitStart = usecTimestampNow();
_processLock.lock();
quint64 lockWaitEnd = usecTimestampNow();
lockWaitElapsedUsec = (float)(lockWaitEnd - lockWaitStart);
OctreeServer::trackProcessWaitTime(lockWaitElapsedUsec);
quint64 start = usecTimestampNow(); quint64 start = usecTimestampNow();
// don't do any send processing until the initial load of the octree is complete... // don't do any send processing until the initial load of the octree is complete...
@ -102,8 +91,6 @@ bool OctreeSendThread::process() {
} }
} }
_processLock.unlock();
if (_isShuttingDown) { if (_isShuttingDown) {
return false; // exit early if we're shutting down return false; // exit early if we're shutting down
} }

1
assignment-client/src/octree/OctreeSendThread.h
View file

@ -51,7 +51,6 @@ private:
OctreePacketData _packetData; OctreePacketData _packetData;
int _nodeMissingCount; int _nodeMissingCount;
QMutex _processLock; // don't allow us to have our nodeData, or our thread to be deleted while we're processing
bool _isShuttingDown; bool _isShuttingDown;
}; };