From b8eb4414682528028f6c2d61988604f12b0f174b Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 2 May 2014 09:31:28 -0700 Subject: [PATCH] removed debugging --- interface/src/Application.cpp | 2 -- interface/src/DatagramProcessor.cpp | 1 - libraries/networking/src/PacketSender.cpp | 11 ----------- 3 files changed, 14 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index b87c536364..d7eafda3a5 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -3210,8 +3210,6 @@ void Application::nodeKilled(SharedNodePointer node) { } else if (node->getType() == NodeType::ModelServer) { -qDebug()<< "nodeKilled... NodeType::ModelServer"; - QUuid nodeUUID = node->getUUID(); // see if this is the first we've heard of this node... if (_modelServerJurisdictions.find(nodeUUID) != _modelServerJurisdictions.end()) { diff --git a/interface/src/DatagramProcessor.cpp b/interface/src/DatagramProcessor.cpp index ebccde39f2..56df4042ac 100644 --- a/interface/src/DatagramProcessor.cpp +++ b/interface/src/DatagramProcessor.cpp @@ -58,7 +58,6 @@ void DatagramProcessor::processDatagrams() { break; case PacketTypeModelAddResponse: -qDebug() << ">>>>>>>>> got PacketTypeModelAddResponse..."; // this will keep creatorTokenIDs to IDs mapped correctly ModelItem::handleAddModelResponse(incomingPacket); application->getModels()->getTree()->handleAddModelResponse(incomingPacket); diff --git a/libraries/networking/src/PacketSender.cpp b/libraries/networking/src/PacketSender.cpp index dcb7932536..5f7502a738 100644 --- a/libraries/networking/src/PacketSender.cpp +++ b/libraries/networking/src/PacketSender.cpp @@ -42,7 +42,6 @@ PacketSender::PacketSender(int packetsPerSecond) : _totalPacketsQueued(0), _totalBytesQueued(0) { - qDebug() << "PacketSender::PacketSender() this=" << this; } PacketSender::~PacketSender() { @@ -50,7 +49,6 @@ PacketSender::~PacketSender() { void PacketSender::queuePacketForSending(const SharedNodePointer& destinationNode, const QByteArray& packet) { - qDebug() << "PacketSender::queuePacketForSending() this=" << this << "packet.size()=" << packet.size(); NetworkPacket networkPacket(destinationNode, packet); lock(); _packets.push_back(networkPacket); @@ -79,8 +77,6 @@ void PacketSender::terminating() { } bool PacketSender::threadedProcess() { - qDebug() << "PacketSender::threadedProcess() this=" << this; - bool hasSlept = false; if (_lastSendTime == 0) { @@ -108,7 +104,6 @@ bool PacketSender::threadedProcess() { if (usecToSleep > MAX_SLEEP_INTERVAL) { usecToSleep = MAX_SLEEP_INTERVAL; } - qDebug() << "PacketSender::threadedProcess() this=" << this << "calling usleep() usecToSleep=" << usecToSleep; usleep(usecToSleep); hasSlept = true; } @@ -145,7 +140,6 @@ bool PacketSender::threadedProcess() { // We also keep a running total of packets sent over multiple calls to process() so that we can adjust up or down for // possible rounding error that would occur if we only considered whole integer packet counts per call to process bool PacketSender::nonThreadedProcess() { - qDebug() << "PacketSender::nonThreadedProcess() this=" << this; quint64 now = usecTimestampNow(); if (_lastProcessCallTime == 0) { @@ -252,8 +246,6 @@ bool PacketSender::nonThreadedProcess() { packetsToSendThisCall -= adjust; } - qDebug() << "PacketSender::nonThreadedProcess() this=" << this << "packetsToSendThisCall=" << packetsToSendThisCall; - // now, do we want to reset the check interval? don't want to completely reset, because we would still have // a rounding error. instead, we check to see that we've passed the reset interval (which is much larger than // the check interval), and on those reset intervals we take the second half average and keep that for the next @@ -269,8 +261,6 @@ bool PacketSender::nonThreadedProcess() { int packetsLeft = _packets.size(); - qDebug() << "PacketSender::nonThreadedProcess() this=" << this << "packetsLeft=" << packetsLeft; - // Now that we know how many packets to send this call to process, just send them. while ((packetsSentThisCall < packetsToSendThisCall) && (packetsLeft > 0)) { lock(); @@ -281,7 +271,6 @@ bool PacketSender::nonThreadedProcess() { unlock(); // send the packet through the NodeList... - qDebug() << "PacketSender::nonThreadedProcess() this=" << this << "calling writeDatagram()..."; NodeList::getInstance()->writeDatagram(temporary.getByteArray(), temporary.getDestinationNode()); packetsSentThisCall++; _packetsOverCheckInterval++;