From 81b88cb096c30ae6c82fe26a4e55badee1f81475 Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Tue, 6 Oct 2015 16:12:04 -0700 Subject: [PATCH] Renamed MessagePart > MessagePartNumber --- libraries/networking/src/udt/Connection.cpp | 8 ++++---- libraries/networking/src/udt/Packet.cpp | 14 +++++++------- libraries/networking/src/udt/Packet.h | 8 ++++---- libraries/networking/src/udt/PacketList.cpp | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libraries/networking/src/udt/Connection.cpp b/libraries/networking/src/udt/Connection.cpp index c8264a6737..96d73676f0 100644 --- a/libraries/networking/src/udt/Connection.cpp +++ b/libraries/networking/src/udt/Connection.cpp @@ -860,16 +860,16 @@ void PendingReceivedMessage::enqueuePacket(std::unique_ptr packet) { if (packet->getPacketPosition() == Packet::PacketPosition::LAST || packet->getPacketPosition() == Packet::PacketPosition::ONLY) { _hasLastPacket = true; - _numPackets = packet->getMessagePart() + 1; + _numPackets = packet->getMessagePartNumber() + 1; } // Insert into the packets list in sorted order. Because we generally expect to receive packets in order, begin // searching from the end of the list. - auto messagePart = packet->getMessagePart(); + auto messagePartNumber = packet->getMessagePartNumber(); auto it = std::find_if(_packets.rbegin(), _packets.rend(), - [&](const std::unique_ptr& value) { return messagePart >= value->getMessagePart(); }); + [&](const std::unique_ptr& value) { return messagePartNumber >= value->getMessagePartNumber(); }); - if (it != _packets.rend() && ((*it)->getMessagePart() == messagePart)) { + if (it != _packets.rend() && ((*it)->getMessagePartNumber() == messagePartNumber)) { qCDebug(networking) << "PendingReceivedMessage::enqueuePacket: This is a duplicate packet"; return; } diff --git a/libraries/networking/src/udt/Packet.cpp b/libraries/networking/src/udt/Packet.cpp index ebcf4baafd..d06ff9707e 100644 --- a/libraries/networking/src/udt/Packet.cpp +++ b/libraries/networking/src/udt/Packet.cpp @@ -15,7 +15,7 @@ using namespace udt; int Packet::localHeaderSize(bool isPartOfMessage) { return sizeof(Packet::SequenceNumberAndBitField) + - (isPartOfMessage ? sizeof(Packet::MessageNumberAndBitField) + sizeof(MessagePart) : 0); + (isPartOfMessage ? sizeof(Packet::MessageNumberAndBitField) + sizeof(MessagePartNumber) : 0); } int Packet::totalHeaderSize(bool isPartOfMessage) { @@ -109,11 +109,11 @@ Packet& Packet::operator=(Packet&& other) { return *this; } -void Packet::writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePart messagePart) { +void Packet::writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePartNumber messagePartNumber) { _isPartOfMessage = true; _messageNumber = messageNumber; _packetPosition = position; - _messagePart = messagePart; + _messagePartNumber = messagePartNumber; writeHeader(); } @@ -144,8 +144,8 @@ void Packet::readHeader() const { _messageNumber = *messageNumberAndBitField & MESSAGE_NUMBER_MASK; _packetPosition = static_cast(*messageNumberAndBitField >> PACKET_POSITION_OFFSET); - MessagePart* messagePart = messageNumberAndBitField + 1; - _messagePart = *messagePart; + MessagePartNumber* messagePartNumber = messageNumberAndBitField + 1; + _messagePartNumber = *messagePartNumber; } } @@ -172,7 +172,7 @@ void Packet::writeHeader() const { *messageNumberAndBitField = _messageNumber; *messageNumberAndBitField |= _packetPosition << PACKET_POSITION_OFFSET; - MessagePart* messagePart = messageNumberAndBitField + 1; - *messagePart = _messagePart; + MessagePartNumber* messagePartNumber = messageNumberAndBitField + 1; + *messagePartNumber = _messagePartNumber; } } diff --git a/libraries/networking/src/udt/Packet.h b/libraries/networking/src/udt/Packet.h index 71fb22eb98..24b9144672 100644 --- a/libraries/networking/src/udt/Packet.h +++ b/libraries/networking/src/udt/Packet.h @@ -31,7 +31,7 @@ public: // NOTE: The MessageNumber is only actually 30 bits to leave room for a bit field using MessageNumber = uint32_t; using MessageNumberAndBitField = uint32_t; - using MessagePart = uint32_t; + using MessagePartNumber = uint32_t; // Use same size as MessageNumberAndBitField so we can use the enum with bitwise operations enum PacketPosition : MessageNumberAndBitField { @@ -60,9 +60,9 @@ public: SequenceNumber getSequenceNumber() const { return _sequenceNumber; } MessageNumber getMessageNumber() const { return _messageNumber; } PacketPosition getPacketPosition() const { return _packetPosition; } - MessagePart getMessagePart() const { return _messagePart; } + MessagePartNumber getMessagePartNumber() const { return _messagePartNumber; } - void writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePart messagePart); + void writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePartNumber messagePartNumber); void writeSequenceNumber(SequenceNumber sequenceNumber) const; protected: @@ -86,7 +86,7 @@ private: mutable SequenceNumber _sequenceNumber { 0 }; mutable MessageNumber _messageNumber { 0 }; mutable PacketPosition _packetPosition { PacketPosition::ONLY }; - mutable MessagePart _messagePart { 0 }; + mutable MessagePartNumber _messagePartNumber { 0 }; }; } // namespace udt diff --git a/libraries/networking/src/udt/PacketList.cpp b/libraries/networking/src/udt/PacketList.cpp index 8f6a65abc9..ffe2b3eeba 100644 --- a/libraries/networking/src/udt/PacketList.cpp +++ b/libraries/networking/src/udt/PacketList.cpp @@ -140,13 +140,13 @@ void PacketList::preparePackets(MessageNumber messageNumber) { } else { const auto second = ++_packets.begin(); const auto last = --_packets.end(); - Packet::MessagePart messagePart = 0; + Packet::MessagePartNumber messagePartNumber = 0; std::for_each(second, last, [&](const PacketPointer& packet) { - packet->writeMessageNumber(messageNumber, Packet::PacketPosition::MIDDLE, ++messagePart); + packet->writeMessageNumber(messageNumber, Packet::PacketPosition::MIDDLE, ++messagePartNumber); }); _packets.front()->writeMessageNumber(messageNumber, Packet::PacketPosition::FIRST, 0); - _packets.back()->writeMessageNumber(messageNumber, Packet::PacketPosition::LAST, ++messagePart); + _packets.back()->writeMessageNumber(messageNumber, Packet::PacketPosition::LAST, ++messagePartNumber); } }