Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 12:16:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update PacketList::writeData() to be non-recursive

Browse source
This commit is contained in:
Ryan Huffman 2015-08-25 14:58:56 -07:00
parent 0352782e46
commit c1b9613a30
1 changed files with 78 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -98,18 +98,20 @@ QByteArray PacketList::getMessage() {
} }
qint64 PacketList::writeData(const char* data, qint64 maxSize) { qint64 PacketList::writeData(const char* data, qint64 maxSize) {
auto sizeRemaining = maxSize;
while (sizeRemaining > 0) {
if (!_currentPacket) { if (!_currentPacket) {
// we don't have a current packet, time to set one up // we don't have a current packet, time to set one up
_currentPacket = createPacketWithExtendedHeader(); _currentPacket = createPacketWithExtendedHeader();
} }
// check if this block of data can fit into the currentPacket // check if this block of data can fit into the currentPacket
if (maxSize <= _currentPacket->bytesAvailableForWrite()) { if (sizeRemaining <= _currentPacket->bytesAvailableForWrite()) {
// it fits, just write it to the current packet // it fits, just write it to the current packet
_currentPacket->write(data, maxSize); _currentPacket->write(data, sizeRemaining);
// return the number of bytes written sizeRemaining = 0;
return maxSize;
} else { } else {
// it does not fit - this may need to be in the next packet // it does not fit - this may need to be in the next packet
@ -123,7 +125,7 @@ qint64 PacketList::writeData(const char* data, qint64 maxSize) {
// check now to see if this is an unsupported write // check now to see if this is an unsupported write
int numBytesToEnd = _currentPacket->bytesAvailableForWrite(); int numBytesToEnd = _currentPacket->bytesAvailableForWrite();
if ((newPacket->size() - numBytesToEnd) < maxSize) { if ((newPacket->size() - numBytesToEnd) < sizeRemaining) {
// this is an unsupported case - the segment is bigger than the size of an individual packet // this is an unsupported case - the segment is bigger than the size of an individual packet
// but the PacketList is not going to be sent ordered // but the PacketList is not going to be sent ordered
qDebug() << "Error in PacketList::writeData - attempted to write a segment to an unordered packet that is" qDebug() << "Error in PacketList::writeData - attempted to write a segment to an unordered packet that is"
@ -147,13 +149,13 @@ qint64 PacketList::writeData(const char* data, qint64 maxSize) {
_packets.push_back(std::move(_currentPacket)); _packets.push_back(std::move(_currentPacket));
// write the data to the newPacket // write the data to the newPacket
newPacket->write(data, maxSize); newPacket->write(data, sizeRemaining);
// swap our current packet with the new packet // swap our current packet with the new packet
_currentPacket.swap(newPacket); _currentPacket.swap(newPacket);
// return the number of bytes written to the new packet // We've written all of the data, so set sizeRemaining to 0
return maxSize; sizeRemaining = 0;
} else { } else {
// we're an ordered PacketList - let's fit what we can into the current packet and then put the leftover // we're an ordered PacketList - let's fit what we can into the current packet and then put the leftover
// into a new packet // into a new packet
@ -161,13 +163,19 @@ qint64 PacketList::writeData(const char* data, qint64 maxSize) {
int numBytesToEnd = _currentPacket->bytesAvailableForWrite(); int numBytesToEnd = _currentPacket->bytesAvailableForWrite();
_currentPacket->write(data, numBytesToEnd); _currentPacket->write(data, numBytesToEnd);
// Remove number of bytes written from sizeRemaining
sizeRemaining -= numBytesToEnd;
// Move the data pointer forward
data += numBytesToEnd;
// move the current packet to our list of packets // move the current packet to our list of packets
_packets.push_back(std::move(_currentPacket)); _packets.push_back(std::move(_currentPacket));
}
}
}
// recursively call our writeData method for the remaining data to write to a new packet return maxSize;
return numBytesToEnd + writeData(data + numBytesToEnd, maxSize - numBytesToEnd);
}
}
} }
void PacketList::closeCurrentPacket(bool shouldSendEmpty) { void PacketList::closeCurrentPacket(bool shouldSendEmpty) {