From 71a46a33745f828d1d1ebb33e991832e1e230082 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 17 Nov 2017 13:03:04 -0800 Subject: [PATCH] cleanup --- .../src/entities/EntityServer.cpp | 13 +------------ .../octree/OctreeInboundPacketProcessor.cpp | 10 +--------- .../entities/src/EntityEditPacketSender.cpp | 10 +--------- .../entities/src/EntityItemProperties.cpp | 9 --------- libraries/networking/src/PacketSender.cpp | 19 +------------------ libraries/networking/src/ReceivedMessage.cpp | 14 +++----------- libraries/networking/src/ReceivedMessage.h | 10 ---------- .../src/ReceivedPacketProcessor.cpp | 9 --------- .../octree/src/OctreeEditPacketSender.cpp | 11 +---------- libraries/octree/src/OctreePacketData.cpp | 3 +-- libraries/octree/src/OctreePacketData.h | 3 --- 11 files changed, 9 insertions(+), 102 deletions(-) diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp index 43cdb6d665..995a5bad27 100644 --- a/assignment-client/src/entities/EntityServer.cpp +++ b/assignment-client/src/entities/EntityServer.cpp @@ -41,8 +41,7 @@ EntityServer::EntityServer(ReceivedMessage& message) : DependencyManager::set(); auto& packetReceiver = DependencyManager::get()->getPacketReceiver(); - packetReceiver.registerListenerForTypes({ - //PacketType::EntityAdd, + packetReceiver.registerListenerForTypes({ PacketType::EntityAdd, PacketType::EntityEdit, PacketType::EntityErase, PacketType::EntityPhysics, @@ -52,9 +51,6 @@ EntityServer::EntityServer(ReceivedMessage& message) : this, "handleEntityPacket"); - packetReceiver.registerListener(PacketType::EntityAdd, this, "handleEntityPacket"); - - connect(&_dynamicDomainVerificationTimer, &QTimer::timeout, this, &EntityServer::startDynamicDomainVerification); _dynamicDomainVerificationTimer.setSingleShot(true); } @@ -76,13 +72,6 @@ void EntityServer::aboutToFinish() { } void EntityServer::handleEntityPacket(QSharedPointer message, SharedNodePointer senderNode) { - qDebug() << __FUNCTION__ << "from:" << senderNode->getUUID() << "type:" << message->getType() - << "getNumPackets:" << message->getNumPackets() - << "getSize:" << message->getSize() - << "isFromPacketList:" << message->isFromPacketList() - << "isComplete:" << message->isComplete() - ; - if (_octreeInboundPacketProcessor) { _octreeInboundPacketProcessor->queueReceivedPacket(message, senderNode); } diff --git a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp index d2723e936f..bce6e7fe44 100644 --- a/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp +++ b/assignment-client/src/octree/OctreeInboundPacketProcessor.cpp @@ -76,20 +76,12 @@ void OctreeInboundPacketProcessor::midProcess() { } void OctreeInboundPacketProcessor::processPacket(QSharedPointer message, SharedNodePointer sendingNode) { - - qDebug() << __FUNCTION__ << "from:" << sendingNode->getUUID() << "type:" << message->getType() - << "getNumPackets:" << message->getNumPackets() - << "getSize:" << message->getSize() - << "isFromPacketList:" << message->isFromPacketList() - << "isComplete:" << message->isComplete() - ; - if (_shuttingDown) { qDebug() << "OctreeInboundPacketProcessor::processPacket() while shutting down... ignoring incoming packet"; return; } - bool debugProcessPacket = true; // _myServer->wantsVerboseDebug(); + bool debugProcessPacket = _myServer->wantsVerboseDebug(); if (debugProcessPacket) { qDebug("OctreeInboundPacketProcessor::processPacket() payload=%p payloadLength=%lld", diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp index 42c13119b5..90740948ce 100644 --- a/libraries/entities/src/EntityEditPacketSender.cpp +++ b/libraries/entities/src/EntityEditPacketSender.cpp @@ -81,9 +81,6 @@ void EntityEditPacketSender::queueEditEntityMessage(PacketType type, EntityTreePointer entityTree, EntityItemID entityItemID, const EntityItemProperties& properties) { - - qDebug() << __FUNCTION__ << "type:" << type; - if (!_shouldSend) { return; // bail early } @@ -97,13 +94,10 @@ void EntityEditPacketSender::queueEditEntityMessage(PacketType type, QByteArray bufferOut(NLPacket::maxPayloadSize(type), 0); if (type == PacketType::EntityAdd) { - auto MAX_ADD_DATA_SIZE = NLPacket::maxPayloadSize(type) * 10; // a really big packet + auto MAX_ADD_DATA_SIZE = NLPacket::maxPayloadSize(type) * 10; // a really big buffer bufferOut.resize(MAX_ADD_DATA_SIZE); } - qDebug() << __FUNCTION__ << "bufferOut.size():" << bufferOut.size(); - - OctreeElement::AppendState encodeResult = OctreeElement::PARTIAL; // start the loop assuming there's more to send auto nodeList = DependencyManager::get(); @@ -127,8 +121,6 @@ void EntityEditPacketSender::queueEditEntityMessage(PacketType type, qCDebug(entities) << " properties:" << properties; #endif - qDebug() << __FUNCTION__ << "about to call queueOctreeEditMessage() --- bufferOut.size():" << bufferOut.size(); - queueOctreeEditMessage(type, bufferOut); if (type == PacketType::EntityAdd && !properties.getCertificateID().isEmpty()) { emit addingEntityWithCertificate(properties.getCertificateID(), DependencyManager::get()->getPlaceName()); diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 2302765b1a..108fc14e30 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -1227,9 +1227,6 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy OctreePacketData ourDataPacket(false, buffer.size()); // create a packetData object to add out packet details too. OctreePacketData* packetData = &ourDataPacket; // we want a pointer to this so we can use our APPEND_ENTITY_PROPERTY macro - qDebug() << __FUNCTION__ << "OctreePacketData::getBytesAvailable():" << packetData->getBytesAvailable(); - - bool success = true; // assume the best OctreeElement::AppendState appendState = OctreeElement::COMPLETED; // assume the best @@ -1528,15 +1525,9 @@ OctreeElement::AppendState EntityItemProperties::encodeEntityEditPacket(PacketTy const char* finalizedData = reinterpret_cast(packetData->getFinalizedData()); int finalizedSize = packetData->getFinalizedSize(); - qDebug() << __FUNCTION__ << "packetData->getFinalizedSize():" << packetData->getFinalizedSize(); - qDebug() << __FUNCTION__ << "packetData->getUncompressedSize():" << packetData->getUncompressedSize(); - qDebug() << __FUNCTION__ << "buffer.size():" << buffer.size(); - if (finalizedSize <= buffer.size()) { buffer.replace(0, finalizedSize, finalizedData, finalizedSize); buffer.resize(finalizedSize); - qDebug() << __FUNCTION__ << "replaced with finalized data size:" << buffer.size(); - } else { qCDebug(entities) << "ERROR - encoded edit message doesn't fit in output buffer."; success = false; diff --git a/libraries/networking/src/PacketSender.cpp b/libraries/networking/src/PacketSender.cpp index 2ccd9094ed..657a122cbe 100644 --- a/libraries/networking/src/PacketSender.cpp +++ b/libraries/networking/src/PacketSender.cpp @@ -64,9 +64,6 @@ void PacketSender::queuePacketListForSending(const SharedNodePointer& destinatio _totalPacketsQueued += packetList->getNumPackets(); _totalBytesQueued += packetList->getMessageSize(); - qDebug() << __FUNCTION__ << "to:" << destinationNode->getUUID() << "type:" << packetList->getType() << "size:" << packetList->getDataSize() - << "_totalPacketsQueued:" << _totalPacketsQueued << "_totalBytesQueued:" << _totalBytesQueued; - lock(); _packets.push_back({ destinationNode, PacketOrPacketList { nullptr, std::move(packetList)} }); unlock(); @@ -293,16 +290,9 @@ bool PacketSender::nonThreadedProcess() { size_t packetCount = sendAsPacket ? 1 : packetPair.second.second->getNumPackets(); if (sendAsPacket) { - - qDebug() << __FUNCTION__ << "sendUnreliablePacket() to:" << packetPair.first->getUUID() << "type:" << packetPair.second.first->getType(); DependencyManager::get()->sendUnreliablePacket(*packetPair.second.first, *packetPair.first); } else { - - qDebug() << __FUNCTION__ << "sendPacketList() to:" << packetPair.first->getUUID() << "type:" << packetPair.second.second->getType() - << "getMessageSize:" << packetPair.second.second->getMessageSize() - << "getDataSize:" << packetPair.second.second->getDataSize(); - - DependencyManager::get()->sendPacketList(*packetPair.second.second, *packetPair.first); + DependencyManager::get()->sendPacketList(std::move(packetPair.second.second), *packetPair.first); } @@ -313,13 +303,6 @@ bool PacketSender::nonThreadedProcess() { _totalBytesSent += packetSize; emit packetSent(packetSize); // FIXME should include number of packets? - - qDebug() << __FUNCTION__ << "packetsSentThisCall:" << packetsSentThisCall - << "_packetsOverCheckInterval:" << _packetsOverCheckInterval - << "_totalPacketsSent:" << _totalPacketsSent - << "packetSize:" << packetSize - << "_totalBytesSent:" << _totalBytesSent; - _lastSendTime = now; } return isStillRunning(); diff --git a/libraries/networking/src/ReceivedMessage.cpp b/libraries/networking/src/ReceivedMessage.cpp index 8a3322ce20..00b16908ce 100644 --- a/libraries/networking/src/ReceivedMessage.cpp +++ b/libraries/networking/src/ReceivedMessage.cpp @@ -26,10 +26,8 @@ ReceivedMessage::ReceivedMessage(const NLPacketList& packetList) _sourceID(packetList.getSourceID()), _packetType(packetList.getType()), _packetVersion(packetList.getVersion()), - _senderSockAddr(packetList.getSenderSockAddr()), - _fromPacketList(true) + _senderSockAddr(packetList.getSenderSockAddr()) { - qDebug() << __FUNCTION__ << "(const NLPacketList& packetList) _fromPacketList:" << _fromPacketList; } ReceivedMessage::ReceivedMessage(NLPacket& packet) @@ -40,12 +38,8 @@ ReceivedMessage::ReceivedMessage(NLPacket& packet) _packetType(packet.getType()), _packetVersion(packet.getVersion()), _senderSockAddr(packet.getSenderSockAddr()), - _isComplete(packet.getPacketPosition() == NLPacket::ONLY), - _fromPacket(true) + _isComplete(packet.getPacketPosition() == NLPacket::ONLY) { - if (packet.getType() == PacketType::EntityAdd) { - qDebug() << __FUNCTION__ << "(NLPacket& packet) _fromPacketList:" << _fromPacketList << "packet.getType():" << packet.getType(); - } } ReceivedMessage::ReceivedMessage(QByteArray byteArray, PacketType packetType, PacketVersion packetVersion, @@ -57,10 +51,8 @@ ReceivedMessage::ReceivedMessage(QByteArray byteArray, PacketType packetType, Pa _packetType(packetType), _packetVersion(packetVersion), _senderSockAddr(senderSockAddr), - _isComplete(true), - _fromByteArray(true) + _isComplete(true) { - qDebug() << __FUNCTION__ << "(QByteArray byteArray)... _fromPacketList:" << _fromPacketList; } void ReceivedMessage::setFailed() { diff --git a/libraries/networking/src/ReceivedMessage.h b/libraries/networking/src/ReceivedMessage.h index 2af4798bc3..ae51e7592a 100644 --- a/libraries/networking/src/ReceivedMessage.h +++ b/libraries/networking/src/ReceivedMessage.h @@ -79,10 +79,6 @@ public: template qint64 readHeadPrimitive(T* data); - bool isFromPacketList() const { return _fromPacketList; }; - bool isFromPacket() const { return _fromPacket; }; - bool isFromByteArray() const { return _fromByteArray; }; - signals: void progress(qint64 size); void completed(); @@ -104,12 +100,6 @@ private: std::atomic _isComplete { true }; std::atomic _failed { false }; - - std::atomic _fromPacketList { false }; - std::atomic _fromPacket { false }; - std::atomic _fromByteArray { false }; - - }; Q_DECLARE_METATYPE(ReceivedMessage*) diff --git a/libraries/networking/src/ReceivedPacketProcessor.cpp b/libraries/networking/src/ReceivedPacketProcessor.cpp index eda5109279..c18d4ed1e8 100644 --- a/libraries/networking/src/ReceivedPacketProcessor.cpp +++ b/libraries/networking/src/ReceivedPacketProcessor.cpp @@ -25,15 +25,6 @@ void ReceivedPacketProcessor::terminating() { } void ReceivedPacketProcessor::queueReceivedPacket(QSharedPointer message, SharedNodePointer sendingNode) { - - qDebug() << __FUNCTION__ << "from:" << sendingNode->getUUID() << "type:" << message->getType() - << "getNumPackets:" << message->getNumPackets() - << "getSize:" << message->getSize() - << "isFromPacketList:" << message->isFromPacketList() - << "isComplete:" << message->isComplete() - ; - - lock(); _packets.push_back({ sendingNode, message }); _nodePacketCounts[sendingNode->getUUID()]++; diff --git a/libraries/octree/src/OctreeEditPacketSender.cpp b/libraries/octree/src/OctreeEditPacketSender.cpp index 7e04fa6630..a880b44074 100644 --- a/libraries/octree/src/OctreeEditPacketSender.cpp +++ b/libraries/octree/src/OctreeEditPacketSender.cpp @@ -118,9 +118,6 @@ void OctreeEditPacketSender::queuePacketToNode(const QUuid& nodeUUID, std::uniqu // This method is called when the edit packet layer has determined that it has a fully formed packet destined for // a known nodeID. void OctreeEditPacketSender::queuePacketListToNode(const QUuid& nodeUUID, std::unique_ptr packetList) { - - qDebug() << __FUNCTION__ << "to:" << nodeUUID << "type:" << packetList->getType() << "size:" << packetList->getDataSize(); - bool wantDebug = false; DependencyManager::get()->eachNode([&](const SharedNodePointer& node) { // only send to the NodeTypes that are getMyNodeType() @@ -129,10 +126,7 @@ void OctreeEditPacketSender::queuePacketListToNode(const QUuid& nodeUUID, std::u && node->getActiveSocket()) { // NOTE: unlike packets, the packet lists don't get rewritten sequence numbers. - - // add packet to history -- we don't keep track of sent PacketLists - //_sentPacketHistories[nodeUUID].packetSent(sequence, *packet); - + // or do history for resend queuePacketListForSending(node, std::move(packetList)); } }); @@ -380,9 +374,6 @@ void OctreeEditPacketSender::releaseQueuedPacket(const QUuid& nodeID, std::uniqu } void OctreeEditPacketSender::releaseQueuedPacketList(const QUuid& nodeID, std::unique_ptr packetList) { - - qDebug() << __FUNCTION__ << "to:" << nodeID << "type:" << packetList->getType() << "size:" << packetList->getDataSize(); - _releaseQueuedPacketMutex.lock(); if (packetList->getMessageSize() > 0 && packetList->getType() != PacketType::Unknown) { queuePacketListToNode(nodeID, std::move(packetList)); diff --git a/libraries/octree/src/OctreePacketData.cpp b/libraries/octree/src/OctreePacketData.cpp index 5b3e68c0a1..a2aad33058 100644 --- a/libraries/octree/src/OctreePacketData.cpp +++ b/libraries/octree/src/OctreePacketData.cpp @@ -35,8 +35,7 @@ OctreePacketData::OctreePacketData(bool enableCompression, int targetSize) { void OctreePacketData::changeSettings(bool enableCompression, unsigned int targetSize) { _enableCompression = enableCompression; - _targetSize = targetSize; // std::min(MAX_OCTREE_UNCOMRESSED_PACKET_SIZE, targetSize); - + _targetSize = targetSize; _uncompressedByteArray.resize(_targetSize); _compressedByteArray.resize(_targetSize); diff --git a/libraries/octree/src/OctreePacketData.h b/libraries/octree/src/OctreePacketData.h index 0c582f4ed6..09eb134124 100644 --- a/libraries/octree/src/OctreePacketData.h +++ b/libraries/octree/src/OctreePacketData.h @@ -279,8 +279,6 @@ private: unsigned int _targetSize; bool _enableCompression; - //unsigned char _uncompressed[MAX_OCTREE_UNCOMRESSED_PACKET_SIZE]; - QByteArray _uncompressedByteArray; unsigned char* _uncompressed { nullptr }; int _bytesInUse; @@ -291,7 +289,6 @@ private: bool compressContent(); - //unsigned char _compressed[MAX_OCTREE_UNCOMRESSED_PACKET_SIZE]; QByteArray _compressedByteArray; unsigned char* _compressed { nullptr }; int _compressedBytes;