Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

tweak shutdown

Browse source
This commit is contained in:
ZappoMan 2014-03-31 17:05:31 -07:00
parent dc302e7126
commit ef68f164c9
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
assignment-client/src/octree/OctreeQueryNode.cpp
View file

@ -107,8 +107,13 @@ void OctreeQueryNode::nodeKilled() {
void OctreeQueryNode::initializeOctreeSendThread(const SharedAssignmentPointer& myAssignment, const SharedNodePointer& node) { void OctreeQueryNode::initializeOctreeSendThread(const SharedAssignmentPointer& myAssignment, const SharedNodePointer& node) {
// Create octree sending thread... // Create octree sending thread...
qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... BEFORE new OctreeSendThread(myAssignment, node);";
_octreeSendThread = new OctreeSendThread(myAssignment, node); _octreeSendThread = new OctreeSendThread(myAssignment, node);
qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... AFTER new OctreeSendThread(myAssignment, node);";
qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... BEFORE _octreeSendThread->initialize(true)";
_octreeSendThread->initialize(true); _octreeSendThread->initialize(true);
qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... AFTER _octreeSendThread->initialize(true)";
} }
bool OctreeQueryNode::packetIsDuplicate() const { bool OctreeQueryNode::packetIsDuplicate() const {

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

@ -28,10 +28,19 @@ OctreeSendThread::OctreeSendThread(const SharedAssignmentPointer& myAssignment,
_nodeMissingCount(0), _nodeMissingCount(0),
_isShuttingDown(false) _isShuttingDown(false)
{ {
qDebug() << qPrintable(_myServer->getMyServerName()) << "server [" << _myServer << "]: client connected " qDebug() << "OctreeSendThread::OctreeSendThread()... START";
QString serverName("Octree");
if (_myServer) {
serverName = _myServer->getMyServerName();
}
qDebug() << qPrintable(serverName) << "server [" << _myServer << "]: client connected "
"- starting sending thread [" << this << "]"; "- starting sending thread [" << this << "]";
qDebug() << "OctreeSendThread::OctreeSendThread()... before OctreeServer::clientConnected()";
OctreeServer::clientConnected(); OctreeServer::clientConnected();
qDebug() << "OctreeSendThread::OctreeSendThread()... AFTER OctreeServer::clientConnected()";
qDebug() << "OctreeSendThread::OctreeSendThread()... DONE";
} }
OctreeSendThread::~OctreeSendThread() { OctreeSendThread::~OctreeSendThread() {

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

@ -842,8 +842,12 @@ void OctreeServer::readPendingDatagrams() {
if (debug) { if (debug) {
qDebug() << "calling initializeOctreeSendThread()... node:" << *matchingNode; qDebug() << "calling initializeOctreeSendThread()... node:" << *matchingNode;
} }
qDebug() << "OctreeServer::readPendingDatagrams()... BEFORE nodeData->initializeOctreeSendThread()";
SharedAssignmentPointer sharedAssignment = AssignmentClient::getCurrentAssignment(); SharedAssignmentPointer sharedAssignment = AssignmentClient::getCurrentAssignment();
nodeData->initializeOctreeSendThread(sharedAssignment, matchingNode); nodeData->initializeOctreeSendThread(sharedAssignment, matchingNode);
qDebug() << "OctreeServer::readPendingDatagrams()... AFTER nodeData->initializeOctreeSendThread()";
} }
} }
} else if (packetType == PacketTypeJurisdictionRequest) { } else if (packetType == PacketTypeJurisdictionRequest) {