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

Merge pull request #7369 from birarda/udt-slow-start

Browse source 
repairs to udt SendQueue packet timing
This commit is contained in:
Clément Brisset 2016-03-16 09:44:58 -07:00
commit 35aa074955
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/networking/src/udt/SendQueue.cpp
View file

@ -29,6 +29,7 @@
#include "Socket.h" #include "Socket.h"
using namespace udt; using namespace udt;
using namespace std::chrono;
template <typename Mutex1, typename Mutex2> template <typename Mutex1, typename Mutex2>
class DoubleLock { class DoubleLock {
@ -280,11 +281,11 @@ void SendQueue::run() {
// Once we're here we've either received the handshake ACK or it's going to be time to re-send a handshake. // Once we're here we've either received the handshake ACK or it's going to be time to re-send a handshake.
// Either way let's continue processing - no packets will be sent if no handshake ACK has been received. // Either way let's continue processing - no packets will be sent if no handshake ACK has been received.
} }
// Keep an HRC to know when the next packet should have been
auto nextPacketTimestamp = p_high_resolution_clock::now();
while (_state == State::Running) { while (_state == State::Running) {
// Record how long the loop takes to execute
const auto loopStartTimestamp = p_high_resolution_clock::now();
bool sentAPacket = maybeResendPacket(); bool sentAPacket = maybeResendPacket();
// if we didn't find a packet to re-send AND we think we can fit a new packet on the wire // if we didn't find a packet to re-send AND we think we can fit a new packet on the wire
@ -303,10 +304,13 @@ void SendQueue::run() {
if (_state != State::Running || isInactive(sentAPacket)) { if (_state != State::Running || isInactive(sentAPacket)) {
return; return;
} }
// push the next packet timestamp forwards by the current packet send period
nextPacketTimestamp += std::chrono::microseconds(_packetSendPeriod);
// sleep as long as we need until next packet send, if we can // sleep as long as we need until next packet send, if we can
const auto loopEndTimestamp = p_high_resolution_clock::now(); const auto timeToSleep = duration_cast<microseconds>(nextPacketTimestamp - p_high_resolution_clock::now());
const auto timeToSleep = (loopStartTimestamp + std::chrono::microseconds(_packetSendPeriod)) - loopEndTimestamp;
std::this_thread::sleep_for(timeToSleep); std::this_thread::sleep_for(timeToSleep);
} }
} }