Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 10:07:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Renamed MessagePart > MessagePartNumber

Browse source
This commit is contained in:
Atlante45 2015-10-06 16:12:04 -07:00
parent f5f349e13a
commit 81b88cb096
4 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/networking/src/udt/Connection.cpp
View file

@ -860,16 +860,16 @@ void PendingReceivedMessage::enqueuePacket(std::unique_ptr<Packet> packet) {
if (packet->getPacketPosition() == Packet::PacketPosition::LAST || if (packet->getPacketPosition() == Packet::PacketPosition::LAST ||
packet->getPacketPosition() == Packet::PacketPosition::ONLY) { packet->getPacketPosition() == Packet::PacketPosition::ONLY) {
_hasLastPacket = true; _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 // 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. // searching from the end of the list.
auto messagePart = packet->getMessagePart(); auto messagePartNumber = packet->getMessagePartNumber();
auto it = std::find_if(_packets.rbegin(), _packets.rend(), auto it = std::find_if(_packets.rbegin(), _packets.rend(),
[&](const std::unique_ptr<Packet>& value) { return messagePart >= value->getMessagePart(); }); [&](const std::unique_ptr<Packet>& 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"; qCDebug(networking) << "PendingReceivedMessage::enqueuePacket: This is a duplicate packet";
return; return;
} }

14
libraries/networking/src/udt/Packet.cpp
View file

@ -15,7 +15,7 @@ using namespace udt;
int Packet::localHeaderSize(bool isPartOfMessage) { int Packet::localHeaderSize(bool isPartOfMessage) {
return sizeof(Packet::SequenceNumberAndBitField) + return sizeof(Packet::SequenceNumberAndBitField) +
(isPartOfMessage ? sizeof(Packet::MessageNumberAndBitField) + sizeof(MessagePart) : 0); (isPartOfMessage ? sizeof(Packet::MessageNumberAndBitField) + sizeof(MessagePartNumber) : 0);
} }
int Packet::totalHeaderSize(bool isPartOfMessage) { int Packet::totalHeaderSize(bool isPartOfMessage) {
@ -109,11 +109,11 @@ Packet& Packet::operator=(Packet&& other) {
return *this; return *this;
} }
void Packet::writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePart messagePart) { void Packet::writeMessageNumber(MessageNumber messageNumber, PacketPosition position, MessagePartNumber messagePartNumber) {
_isPartOfMessage = true; _isPartOfMessage = true;
_messageNumber = messageNumber; _messageNumber = messageNumber;
_packetPosition = position; _packetPosition = position;
_messagePart = messagePart; _messagePartNumber = messagePartNumber;
writeHeader(); writeHeader();
} }
@ -144,8 +144,8 @@ void Packet::readHeader() const {
_messageNumber = *messageNumberAndBitField & MESSAGE_NUMBER_MASK; _messageNumber = *messageNumberAndBitField & MESSAGE_NUMBER_MASK;
_packetPosition = static_cast<PacketPosition>(*messageNumberAndBitField >> PACKET_POSITION_OFFSET); _packetPosition = static_cast<PacketPosition>(*messageNumberAndBitField >> PACKET_POSITION_OFFSET);
MessagePart* messagePart = messageNumberAndBitField + 1; MessagePartNumber* messagePartNumber = messageNumberAndBitField + 1;
_messagePart = *messagePart; _messagePartNumber = *messagePartNumber;
} }
} }
@ -172,7 +172,7 @@ void Packet::writeHeader() const {
*messageNumberAndBitField = _messageNumber; *messageNumberAndBitField = _messageNumber;
*messageNumberAndBitField |= _packetPosition << PACKET_POSITION_OFFSET; *messageNumberAndBitField |= _packetPosition << PACKET_POSITION_OFFSET;
MessagePart* messagePart = messageNumberAndBitField + 1; MessagePartNumber* messagePartNumber = messageNumberAndBitField + 1;
*messagePart = _messagePart; *messagePartNumber = _messagePartNumber;
} }
} }

8
libraries/networking/src/udt/Packet.h
View file

@ -31,7 +31,7 @@ public:
// NOTE: The MessageNumber is only actually 30 bits to leave room for a bit field // NOTE: The MessageNumber is only actually 30 bits to leave room for a bit field
using MessageNumber = uint32_t; using MessageNumber = uint32_t;
using MessageNumberAndBitField = 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 // Use same size as MessageNumberAndBitField so we can use the enum with bitwise operations
enum PacketPosition : MessageNumberAndBitField { enum PacketPosition : MessageNumberAndBitField {
@ -60,9 +60,9 @@ public:
SequenceNumber getSequenceNumber() const { return _sequenceNumber; } SequenceNumber getSequenceNumber() const { return _sequenceNumber; }
MessageNumber getMessageNumber() const { return _messageNumber; } MessageNumber getMessageNumber() const { return _messageNumber; }
PacketPosition getPacketPosition() const { return _packetPosition; } 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; void writeSequenceNumber(SequenceNumber sequenceNumber) const;
protected: protected:
@ -86,7 +86,7 @@ private:
mutable SequenceNumber _sequenceNumber { 0 }; mutable SequenceNumber _sequenceNumber { 0 };
mutable MessageNumber _messageNumber { 0 }; mutable MessageNumber _messageNumber { 0 };
mutable PacketPosition _packetPosition { PacketPosition::ONLY }; mutable PacketPosition _packetPosition { PacketPosition::ONLY };
mutable MessagePart _messagePart { 0 }; mutable MessagePartNumber _messagePartNumber { 0 };
}; };
} // namespace udt } // namespace udt

6
libraries/networking/src/udt/PacketList.cpp
View file

@ -140,13 +140,13 @@ void PacketList::preparePackets(MessageNumber messageNumber) {
} else { } else {
const auto second = ++_packets.begin(); const auto second = ++_packets.begin();
const auto last = --_packets.end(); const auto last = --_packets.end();
Packet::MessagePart messagePart = 0; Packet::MessagePartNumber messagePartNumber = 0;
std::for_each(second, last, [&](const PacketPointer& packet) { 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.front()->writeMessageNumber(messageNumber, Packet::PacketPosition::FIRST, 0);
_packets.back()->writeMessageNumber(messageNumber, Packet::PacketPosition::LAST, ++messagePart); _packets.back()->writeMessageNumber(messageNumber, Packet::PacketPosition::LAST, ++messagePartNumber);
} }
} }