Merge branch 'master' of git://github.com/highfidelity/hifi into 19644

Ryan Huffman committed 12 years ago

Commit 173be2c2 parents f249020 c46453c70 files · +3532 −612Browse files

Showing the changes to interface/src/Application.cpp (1 of 70 files). Show all

Unified · Split

         const quint64 TOO_LONG_SINCE_LAST_NACK = 1 * USECS_PER_SECOND;
         if (sinceLastNack > TOO_LONG_SINCE_LAST_NACK) {
             _lastNackTime = now;
-            sendNack();
+            sendNackPackets();
         }
     }
 }
-void Application::sendNack() {
+int Application::sendNackPackets() {
     if (Menu::getInstance()->isOptionChecked(MenuOption::DisableNackPackets)) {
-        return;
+        return 0;
     }
+    int packetsSent = 0;
     char packet[MAX_PACKET_SIZE];
-    NodeList* nodeList = NodeList::getInstance();
     // iterates thru all nodes in NodeList
     foreach(const SharedNodePointer& node, NodeList::getInstance()->getNodeHash()) {
             || node->getType() == NodeType::ModelServer)
             ) {
+            QUuid nodeUUID = node->getUUID();
             // if there are octree packets from this node that are waiting to be processed,
             // don't send a NACK since the missing packets may be among those waiting packets.
-            if (_octreeProcessor.hasPacketsToProcessFrom(node)) {
+            if (_octreeProcessor.hasPacketsToProcessFrom(nodeUUID)) {
                 continue;
             }
-            QUuid nodeUUID = node->getUUID();
             _octreeSceneStatsLock.lockForRead();
             // retreive octree scene stats of this node
             }
             OctreeSceneStats& stats = _octreeServerSceneStats[nodeUUID];
-            // check if there are any sequence numbers that need to be nacked
+            // make copy of missing sequence numbers from stats
-            int numSequenceNumbersAvailable = stats.getNumSequenceNumbersToNack();
+            const QSet<OCTREE_PACKET_SEQUENCE> missingSequenceNumbers = stats.getMissingSequenceNumbers();
-            if (numSequenceNumbersAvailable == 0) {
-                _octreeSceneStatsLock.unlock();
-                continue;
-            }
-            char* dataAt = packet;
-            int bytesRemaining = MAX_PACKET_SIZE;
-            // pack header
-            int numBytesPacketHeader = populatePacketHeader(packet, PacketTypeOctreeDataNack);
-            dataAt += numBytesPacketHeader;
-            bytesRemaining -= numBytesPacketHeader;
-            int numSequenceNumbersRoomFor = (bytesRemaining - sizeof(uint16_t)) / sizeof(OCTREE_PACKET_SEQUENCE);
-            // calculate and pack the number of sequence numbers
-            uint16_t numSequenceNumbers = min(numSequenceNumbersAvailable, numSequenceNumbersRoomFor);
-            uint16_t* numSequenceNumbersAt = (uint16_t*)dataAt;
-            *numSequenceNumbersAt = numSequenceNumbers;
-            dataAt += sizeof(uint16_t);
-            // pack sequence numbers
-            for (int i = 0; i < numSequenceNumbers; i++) {
-                OCTREE_PACKET_SEQUENCE* sequenceNumberAt = (OCTREE_PACKET_SEQUENCE*)dataAt;
-                *sequenceNumberAt = stats.getNextSequenceNumberToNack();
-                dataAt += sizeof(OCTREE_PACKET_SEQUENCE);
-            }
             _octreeSceneStatsLock.unlock();
-            nodeList->writeUnverifiedDatagram(packet, dataAt - packet, node);
+            // construct nack packet(s) for this node
+            int numSequenceNumbersAvailable = missingSequenceNumbers.size();
+            QSet<OCTREE_PACKET_SEQUENCE>::const_iterator missingSequenceNumbersIterator = missingSequenceNumbers.constBegin();
+            while (numSequenceNumbersAvailable > 0) {
+                char* dataAt = packet;
+                int bytesRemaining = MAX_PACKET_SIZE;
+                // pack header
+                int numBytesPacketHeader = populatePacketHeader(packet, PacketTypeOctreeDataNack);
+                dataAt += numBytesPacketHeader;
+                bytesRemaining -= numBytesPacketHeader;
+                // calculate and pack the number of sequence numbers
+                int numSequenceNumbersRoomFor = (bytesRemaining - sizeof(uint16_t)) / sizeof(OCTREE_PACKET_SEQUENCE);
+                uint16_t numSequenceNumbers = min(numSequenceNumbersAvailable, numSequenceNumbersRoomFor);
+                uint16_t* numSequenceNumbersAt = (uint16_t*)dataAt;
+                *numSequenceNumbersAt = numSequenceNumbers;
+                dataAt += sizeof(uint16_t);
+                // pack sequence numbers
+                for (int i = 0; i < numSequenceNumbers; i++) {
+                    OCTREE_PACKET_SEQUENCE* sequenceNumberAt = (OCTREE_PACKET_SEQUENCE*)dataAt;
+                    *sequenceNumberAt = *missingSequenceNumbersIterator;
+                    dataAt += sizeof(OCTREE_PACKET_SEQUENCE);
+                    missingSequenceNumbersIterator++;
+                }
+                numSequenceNumbersAvailable -= numSequenceNumbers;
+                // send it
+                NodeList::getInstance()->writeUnverifiedDatagram(packet, dataAt - packet, node);
+                packetsSent++;
+            }
         }
     }
+    return packetsSent;
 }
 void Application::queryOctree(NodeType_t serverType, PacketType packetType, NodeToJurisdictionMap& jurisdictions) {
         float creditBalance = accountManager.getAccountInfo().getBalance() / SATOSHIS_PER_CREDIT;
         QString creditBalanceString;
-        creditBalanceString.sprintf("%.8f", creditBalance);
+        creditBalanceString.sprintf("%.8f", floor(creditBalance + 0.5));
         title += " - ₵" + creditBalanceString;
     }
 void Application::nodeKilled(SharedNodePointer node) {
-    // this is here because connecting NodeList::nodeKilled to OctreePacketProcessor::nodeKilled doesn't work:
+    // These are here because connecting NodeList::nodeKilled to OctreePacketProcessor::nodeKilled doesn't work:
-    // OctreePacketProcessor::nodeKilled is not called when NodeList::nodeKilled is emitted for some reason.
+    // OctreePacketProcessor::nodeKilled is not being called when NodeList::nodeKilled is emitted.
+    // This may have to do with GenericThread::threadRoutine() blocking the QThread event loop
     _octreeProcessor.nodeKilled(node);
+    _voxelEditSender.nodeKilled(node);
+    _particleEditSender.nodeKilled(node);
+    _modelEditSender.nodeKilled(node);
     if (node->getType() == NodeType::VoxelServer) {
         QUuid nodeUUID = node->getUUID();
         // see if this is the first we've heard of this node...

Merge branch 'master' of git://github.com/highfidelity/hifi into 19644

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code