StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

fix send rate going up when peer disconnects

Browse Source
This commit is contained in:
notsecure 2014-07-10 10:34:38 -04:00
parent bd4c142e38
commit e2d388b137
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
toxcore/net_crypto.c
View File

@ -2250,6 +2250,24 @@ static void send_crypto_packets(Net_Crypto *c)
notes: needs improvement but seems to work fine for packet loss <1% notes: needs improvement but seems to work fine for packet loss <1%
*/ */
/* additional step: adjust the send rate based on the size change of the send queue */
uint32_t queue_size = num_packets_array(&conn->send_array);
if(queue_size > conn->last_queue_size + 100) {
double v1 = (double)(conn->packets_sent) / (double)(queue_size);
double v2 = (double)(conn->last_packets_sent) / (double)(conn->last_queue_size == 0 ? 1 : conn->last_queue_size);
if(v1 < v2) {
conn->packets_resent = conn->packets_sent;
conn->rate_increase = 0;
}
conn->last_queue_size = queue_size;
conn->last_packets_sent = conn->packets_sent;
} else if(queue_size < conn->last_queue_size) {
conn->last_queue_size = queue_size;
conn->last_packets_sent = conn->packets_sent;
}
//hack to prevent 1 packet lost from affecting calculations at low send rates //hack to prevent 1 packet lost from affecting calculations at low send rates
if (conn->packets_resent == 1) { if (conn->packets_resent == 1) {
conn->packets_resent = 0; conn->packets_resent = 0;
@ -2300,18 +2318,22 @@ static void send_crypto_packets(Net_Crypto *c)
double linear_increase = realrate * 0.0025 + 1.0; double linear_increase = realrate * 0.0025 + 1.0;
//final send rate: average of "real" and previous send rates + increases //final send rate: average of "real" and previous send rates + increases
conn->packet_send_rate = (realrate + conn->packet_send_rate) / 2.0 + conn->rate_increase + linear_increase; double newrate = (realrate + conn->packet_send_rate) / 2.0 + conn->rate_increase + linear_increase;
conn->last_send_rate = conn->packet_send_rate;
conn->packet_send_rate = newrate;
conn->dropped = dropped; conn->dropped = dropped;
conn->drop_ignore = drop_ignore_new; conn->drop_ignore = drop_ignore_new;
conn->packets_resent = 0; conn->packets_resent = 0;
if (conn->packet_send_rate < CRYPTO_PACKET_MIN_RATE || !conn->sending) { if (conn->packet_send_rate < CRYPTO_PACKET_MIN_RATE || !conn->sending || !conn->packets_sent) {
conn->rate_increase = 0; conn->rate_increase = 0;
conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE; conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE;
} }
conn->packets_sent = 0;
if (conn->sending != 0 && num_packets_array(&conn->send_array) < CRYPTO_MIN_QUEUE_LENGTH / 2) { if (conn->sending != 0 && num_packets_array(&conn->send_array) < CRYPTO_MIN_QUEUE_LENGTH / 2) {
--conn->sending; --conn->sending;
} }
@ -2342,6 +2364,7 @@ static void send_crypto_packets(Net_Crypto *c)
conn->packets_resent += ret; conn->packets_resent += ret;
conn->packets_left -= ret; conn->packets_left -= ret;
conn->packets_sent += ret;
} }
if (conn->packet_send_rate > CRYPTO_PACKET_MIN_RATE * 1.5) { if (conn->packet_send_rate > CRYPTO_PACKET_MIN_RATE * 1.5) {
@ -2421,6 +2444,7 @@ int64_t write_cryptpacket(const Net_Crypto *c, int crypt_connection_id, const ui
return -1; return -1;
--conn->packets_left; --conn->packets_left;
conn->packets_sent++;
conn->sending = CONN_SENDING_VALUE; conn->sending = CONN_SENDING_VALUE;
return ret; return ret;
} }

4
toxcore/net_crypto.h
View File

@ -143,9 +143,9 @@ typedef struct {
uint32_t packets_left; uint32_t packets_left;
uint64_t last_packets_left_set; uint64_t last_packets_left_set;
double dropped, drop_ignore, rate_increase; double dropped, drop_ignore, rate_increase, last_send_rate;
uint64_t drop_ignore_start, rate_increase_stop_start; uint64_t drop_ignore_start, rate_increase_stop_start;
uint32_t packets_resent; uint32_t packets_resent, last_queue_size, packets_sent, last_packets_sent;
uint8_t sending; /* indicates if data is being sent or not. */ uint8_t sending; /* indicates if data is being sent or not. */