Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-17 06:26:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

go back to previous PacketTimeWindow code

Browse source
This commit is contained in:
Stephen Birarda 2015-08-03 15:36:08 -07:00
parent d937cf1cc7
commit b5ec02bd01
4 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -77,8 +77,9 @@ void Connection::sendReliablePacket(unique_ptr<Packet> packet) {
void Connection::sync() { void Connection::sync() {
if (_hasReceivedFirstPacket) { if (_hasReceivedFirstPacket) {
// reset the number of light ACKS during this sync interval // reset the number of light ACKs or non SYN ACKs during this sync interval
_lightACKsDuringSYN = 1; _lightACKsDuringSYN = 1;
_acksDuringSYN = 1;
// we send out a periodic ACK every rate control interval // we send out a periodic ACK every rate control interval
sendACK(); sendACK();
@ -327,7 +328,8 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in
++_packetsSinceACK; ++_packetsSinceACK;
// check if we need to send an ACK, according to CC params // check if we need to send an ACK, according to CC params
if (_congestionControl->_ackInterval > 0 && _packetsSinceACK >= _congestionControl->_ackInterval) { if (_congestionControl->_ackInterval > 0 && _packetsSinceACK >= _congestionControl->_ackInterval * _acksDuringSYN) {
_acksDuringSYN++;
sendACK(false); sendACK(false);
} else if (_congestionControl->_lightACKInterval > 0 } else if (_congestionControl->_lightACKInterval > 0
&& _packetsSinceACK >= _congestionControl->_lightACKInterval * _lightACKsDuringSYN) { && _packetsSinceACK >= _congestionControl->_lightACKInterval * _lightACKsDuringSYN) {

1
libraries/networking/src/udt/Connection.h
View file

@ -97,6 +97,7 @@ private:
SequenceNumber _lastSentACK; // The last sent ACK SequenceNumber _lastSentACK; // The last sent ACK
SequenceNumber _lastSentACK2; // The last sent ACK sub-sequence number in an ACK2 SequenceNumber _lastSentACK2; // The last sent ACK sub-sequence number in an ACK2
int _acksDuringSYN { 1 }; // The number of non-SYN ACKs sent during SYN
int _lightACKsDuringSYN { 1 }; // The number of lite ACKs sent during SYN interval int _lightACKsDuringSYN { 1 }; // The number of lite ACKs sent during SYN interval
int32_t _rtt; // RTT, in microseconds int32_t _rtt; // RTT, in microseconds

12
libraries/networking/src/udt/PacketTimeWindow.cpp
View file

@ -11,7 +11,6 @@
#include "PacketTimeWindow.h" #include "PacketTimeWindow.h"
#include <numeric>
#include <cmath> #include <cmath>
#include <NumericalConstants.h> #include <NumericalConstants.h>
@ -49,11 +48,16 @@ int median(Iterator begin, Iterator end) {
int32_t meanOfMedianFilteredValues(std::vector<int> intervals, int numValues, int valuesRequired = 0) { int32_t meanOfMedianFilteredValues(std::vector<int> intervals, int numValues, int valuesRequired = 0) {
// grab the median value of the intervals vector // grab the median value of the intervals vector
int intervalsMedian = median(intervals.begin(), intervals.end()); int median = 0;
if (numValues % 2 == 0) {
median = intervals[numValues / 2];
} else {
median = (intervals[(numValues / 2) - 1] + intervals[numValues / 2]) / 2;
}
static const int MEDIAN_FILTERING_BOUND_MULTIPLIER = 8; static const int MEDIAN_FILTERING_BOUND_MULTIPLIER = 8;
int upperBound = intervalsMedian * MEDIAN_FILTERING_BOUND_MULTIPLIER; int upperBound = median * MEDIAN_FILTERING_BOUND_MULTIPLIER;
int lowerBound = intervalsMedian / MEDIAN_FILTERING_BOUND_MULTIPLIER; int lowerBound = median / MEDIAN_FILTERING_BOUND_MULTIPLIER;
int sum = 0; int sum = 0;
int count = 0; int count = 0;

3
tools/udt-test/src/UDTTest.cpp
View file

@ -42,7 +42,7 @@ const QCommandLineOption UNRELIABLE_PACKETS {
}; };
const QStringList CLIENT_STATS_TABLE_HEADERS { const QStringList CLIENT_STATS_TABLE_HEADERS {
"Send Rate (P/s)", "RTT(ms)", "CW (P)", "Send Period (us)", "Send Rate (P/s)", "Bandwidth (P/s)", "RTT(ms)", "CW (P)", "Send Period (us)",
"Received ACK", "Processed ACK", "Received LACK", "Received NAK", "Received TNAK", "Received ACK", "Processed ACK", "Received LACK", "Received NAK", "Received TNAK",
"Sent ACK2", "Sent Packets", "Re-sent Packets" "Sent ACK2", "Sent Packets", "Re-sent Packets"
}; };
@ -237,6 +237,7 @@ void UDTTest::sampleStats() {
// setup a list of left justified values // setup a list of left justified values
QStringList values { QStringList values {
QString::number(stats.sendRate).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.sendRate).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()),
QString::number(stats.estimatedBandwith).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()),
QString::number(stats.rtt / USECS_PER_MSEC).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.rtt / USECS_PER_MSEC).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()),
QString::number(stats.congestionWindowSize).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.congestionWindowSize).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()),
QString::number(stats.packetSendPeriod).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()), QString::number(stats.packetSendPeriod).leftJustified(CLIENT_STATS_TABLE_HEADERS[++headerIndex].size()),