Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-06 11:34:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cleanup some debugging

Browse source
This commit is contained in:
ZappoMan 2014-03-31 17:57:48 -07:00
parent 4bf7faba7b
commit 9d60be9773
2 changed files with 24 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -49,19 +49,6 @@ OctreeQueryNode::~OctreeQueryNode() {
qDebug() << "OctreeQueryNode::~OctreeQueryNode()";
}
/*
if (_octreeSendThread) {
if (extraDebugging) {
qDebug() << "OctreeQueryNode::~OctreeQueryNode()... calling _octreeSendThread->terminate()";
}
_octreeSendThread->terminate();
if (extraDebugging) {
qDebug() << "OctreeQueryNode::~OctreeQueryNode()... calling delete _octreeSendThread";
}
delete _octreeSendThread;
}
*/
delete[] _octreePacket;
delete[] _lastOctreePacket;
if (extraDebugging) {
@ -84,21 +71,21 @@ void OctreeQueryNode::nodeKilled() {
if (_octreeSendThread) {
OctreeSendThread* sendThread = _octreeSendThread;
qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread = NULL";
//qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread = NULL";
_octreeSendThread = NULL;
qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread = NULL";
//qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread = NULL";
qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread->setIsShuttingDown()";
//qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread->setIsShuttingDown()";
sendThread->setIsShuttingDown();
qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread->setIsShuttingDown()";
//qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread->setIsShuttingDown()";
qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread->terminate()";
//qDebug() << "OctreeQueryNode::nodeKilled()... calling _octreeSendThread->terminate()";
sendThread->terminate();
qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread->terminate()";
//qDebug() << "OctreeQueryNode::nodeKilled()... AFTER _octreeSendThread->terminate()";
qDebug() << "OctreeQueryNode::nodeKilled()... calling delete sendThread";
//qDebug() << "OctreeQueryNode::nodeKilled()... calling delete sendThread";
delete sendThread;
qDebug() << "OctreeQueryNode::nodeKilled()... AFTER delete sendThread";
//qDebug() << "OctreeQueryNode::nodeKilled()... AFTER delete sendThread";
}
qDebug() << "OctreeQueryNode::nodeKilled()... DONE";
@ -107,13 +94,13 @@ void OctreeQueryNode::nodeKilled() {
void OctreeQueryNode::initializeOctreeSendThread(const SharedAssignmentPointer& myAssignment, const SharedNodePointer& node) {
// Create octree sending thread...
qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... BEFORE new OctreeSendThread(myAssignment, node);";
//qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... BEFORE new OctreeSendThread(myAssignment, node);";
_octreeSendThread = new OctreeSendThread(myAssignment, node);
qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... AFTER new OctreeSendThread(myAssignment, node);";
//qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... AFTER new OctreeSendThread(myAssignment, node);";
qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... BEFORE _octreeSendThread->initialize(true)";
//qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... BEFORE _octreeSendThread->initialize(true)";
_octreeSendThread->initialize(true);
qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... AFTER _octreeSendThread->initialize(true)";
//qDebug() << "OctreeQueryNode::initializeOctreeSendThread()... AFTER _octreeSendThread->initialize(true)";
}
bool OctreeQueryNode::packetIsDuplicate() const {

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

@ -28,7 +28,7 @@ OctreeSendThread::OctreeSendThread(const SharedAssignmentPointer& myAssignment,
_nodeMissingCount(0),
_isShuttingDown(false)
{
qDebug() << "OctreeSendThread::OctreeSendThread()... START";
//qDebug() << "OctreeSendThread::OctreeSendThread()... START";
QString serverName("Octree");
if (_myServer) {
@ -37,14 +37,14 @@ OctreeSendThread::OctreeSendThread(const SharedAssignmentPointer& myAssignment,
qDebug() << qPrintable(serverName) << "server [" << _myServer << "]: client connected "
"- starting sending thread [" << this << "]";
qDebug() << "OctreeSendThread::OctreeSendThread()... before OctreeServer::clientConnected()";
//qDebug() << "OctreeSendThread::OctreeSendThread()... before OctreeServer::clientConnected()";
OctreeServer::clientConnected();
qDebug() << "OctreeSendThread::OctreeSendThread()... AFTER OctreeServer::clientConnected()";
qDebug() << "OctreeSendThread::OctreeSendThread()... DONE";
//qDebug() << "OctreeSendThread::OctreeSendThread()... AFTER OctreeServer::clientConnected()";
//qDebug() << "OctreeSendThread::OctreeSendThread()... DONE";
}
OctreeSendThread::~OctreeSendThread() {
qDebug() << "OctreeSendThread::~OctreeSendThread()... START";
//qDebug() << "OctreeSendThread::~OctreeSendThread()... START";
QString serverName("Octree");
if (_myServer) {
serverName = _myServer->getMyServerName();
@ -53,19 +53,19 @@ OctreeSendThread::~OctreeSendThread() {
qDebug() << qPrintable(serverName) << "server [" << _myServer << "]: client disconnected "
"- ending sending thread [" << this << "]";
qDebug() << "OctreeSendThread::~OctreeSendThread()... BEFORE OctreeServer::clientDisconnected();";
//qDebug() << "OctreeSendThread::~OctreeSendThread()... BEFORE OctreeServer::clientDisconnected();";
OctreeServer::clientDisconnected();
qDebug() << "OctreeSendThread::~OctreeSendThread()... AFTER OctreeServer::clientDisconnected();";
//qDebug() << "OctreeSendThread::~OctreeSendThread()... AFTER OctreeServer::clientDisconnected();";
qDebug() << "OctreeSendThread::~OctreeSendThread()... BEFORE _node.clear();";
//qDebug() << "OctreeSendThread::~OctreeSendThread()... BEFORE _node.clear();";
_node.clear();
qDebug() << "OctreeSendThread::~OctreeSendThread()... AFTER _node.clear();";
//qDebug() << "OctreeSendThread::~OctreeSendThread()... AFTER _node.clear();";
qDebug() << "OctreeSendThread::~OctreeSendThread()... BEFORE _myAssignment.clear();";
//qDebug() << "OctreeSendThread::~OctreeSendThread()... BEFORE _myAssignment.clear();";
_myAssignment.clear();
qDebug() << "OctreeSendThread::~OctreeSendThread()... BEFORE _myAssignment.clear();";
//qDebug() << "OctreeSendThread::~OctreeSendThread()... BEFORE _myAssignment.clear();";
qDebug() << "OctreeSendThread::~OctreeSendThread()... DONE";
//qDebug() << "OctreeSendThread::~OctreeSendThread()... DONE";
}
void OctreeSendThread::setIsShuttingDown() {