diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index e878959e51..1a593f3be7 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -253,9 +253,11 @@ OctreeServer::OctreeServer(const QByteArray& packet) : qDebug() << "Octree server starting... [" << this << "]"; + /* QTimer* timer = new QTimer(this); connect(timer, SIGNAL(timeout()), SLOT(doNothing())); timer->start(0); + */ } @@ -842,7 +844,7 @@ quint64 lastProcessNodeData = usecTimestampNow(); void OctreeServer::readPendingDatagrams() { quint64 now = usecTimestampNow(); if ((now - lastReadPendingDatagrams) > 100000) { - qDebug() << "OctreeServer::readPendingDatagrams(): since lastReadPendingDatagrams=" << (now - lastReadPendingDatagrams) << "usecs"; + //qDebug() << "OctreeServer::readPendingDatagrams(): since lastReadPendingDatagrams=" << (now - lastReadPendingDatagrams) << "usecs"; } lastReadPendingDatagrams = now; @@ -884,10 +886,13 @@ void OctreeServer::readPendingDatagrams() { matchingElapsed += (endNodeLookup - startNodeLookup); if ((endNodeLookup - startNodeLookup) > 100000) { - qDebug() << "OctreeServer::readPendingDatagrams(): sendingNodeForPacket() took" << (endNodeLookup - startNodeLookup) << "usecs"; + //qDebug() << "OctreeServer::readPendingDatagrams(): sendingNodeForPacket() took" << (endNodeLookup - startNodeLookup) << "usecs"; } if (packetType == getMyQueryMessageType()) { + +qDebug() << "got a query..."; + quint64 queryStart = usecTimestampNow(); queryPackets++; @@ -898,7 +903,7 @@ void OctreeServer::readPendingDatagrams() { nodeList->updateNodeWithDataFromPacket(matchingNode, receivedPacket); quint64 endUpdateNode = usecTimestampNow(); if ((endUpdateNode - startUpdateNode) > 100000) { - qDebug() << "OctreeServer::readPendingDatagrams(): updateNodeWithDataFromPacket() took" << (endUpdateNode - startUpdateNode) << "usecs"; + //qDebug() << "OctreeServer::readPendingDatagrams(): updateNodeWithDataFromPacket() took" << (endUpdateNode - startUpdateNode) << "usecs"; } OctreeQueryNode* nodeData = (OctreeQueryNode*) matchingNode->getLinkedData(); @@ -927,7 +932,7 @@ void OctreeServer::readPendingDatagrams() { nodeListPackets++; quint64 now = usecTimestampNow(); if ((now - lastProcessNodeData) > 500000) { - qDebug() << "OctreeServer::readPendingDatagrams(): since lastProcessNodeData=" << (now - lastProcessNodeData) << "usecs"; + //qDebug() << "OctreeServer::readPendingDatagrams(): since lastProcessNodeData=" << (now - lastProcessNodeData) << "usecs"; } lastProcessNodeData = now; @@ -936,7 +941,7 @@ void OctreeServer::readPendingDatagrams() { NodeList::getInstance()->processNodeData(senderSockAddr, receivedPacket); quint64 endProcessNodeData = usecTimestampNow(); if ((endProcessNodeData - startProcessNodeData) > 100000) { - qDebug() << "OctreeServer::readPendingDatagrams(): processNodeData() took" << (endProcessNodeData - startProcessNodeData) << "usecs"; + //qDebug() << "OctreeServer::readPendingDatagrams(): processNodeData() took" << (endProcessNodeData - startProcessNodeData) << "usecs"; } quint64 nodeListEnd = usecTimestampNow(); diff --git a/assignment-client/src/octree/OctreeServer.h b/assignment-client/src/octree/OctreeServer.h index d7139b5c3d..7427ee0dbe 100644 --- a/assignment-client/src/octree/OctreeServer.h +++ b/assignment-client/src/octree/OctreeServer.h @@ -126,6 +126,7 @@ public slots: void nodeAdded(SharedNodePointer node); void nodeKilled(SharedNodePointer node); void sendStatsPacket(); + void doNothing(); protected: void parsePayload(); diff --git a/libraries/networking/src/ThreadedAssignment.cpp b/libraries/networking/src/ThreadedAssignment.cpp index 3b00a6a620..528c0b0ff3 100644 --- a/libraries/networking/src/ThreadedAssignment.cpp +++ b/libraries/networking/src/ThreadedAssignment.cpp @@ -81,7 +81,7 @@ quint64 lastCheckIn = usecTimestampNow(); void ThreadedAssignment::checkInWithDomainServerOrExit() { quint64 now = usecTimestampNow(); if ((now - lastCheckIn) > 100000) { - qDebug() << "ThreadedAssignment::checkInWithDomainServerOrExit(): since lastCheckIn=" << (now - lastCheckIn) << "usecs"; + //qDebug() << "ThreadedAssignment::checkInWithDomainServerOrExit(): since lastCheckIn=" << (now - lastCheckIn) << "usecs"; } lastCheckIn = now;