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

More file transfer improvements.

Browse Source 
Use a formula instead of magic numbers.
This commit is contained in:
irungentoo 2015-11-10 19:00:00 -05:00
parent 4a090c73f4
commit 0d0b74f5a8
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
toxcore/net_crypto.c
View File

@ -2125,25 +2125,19 @@ static void send_crypto_packets(Net_Crypto *c)
/* if queue is too big only allow resending packets. */ /* if queue is too big only allow resending packets. */
uint32_t npackets = num_packets_array(&conn->send_array); uint32_t npackets = num_packets_array(&conn->send_array);
if (conn->packet_send_rate * 4 < npackets && CRYPTO_MIN_QUEUE_LENGTH * 4 < npackets) {
conn->last_congestion_event = temp_time;
}
double min_speed = 1000.0 * (((double)(total_sent)) / ((double)(CONGESTION_QUEUE_ARRAY_SIZE) * double min_speed = 1000.0 * (((double)(total_sent)) / ((double)(CONGESTION_QUEUE_ARRAY_SIZE) *
PACKET_COUNTER_AVERAGE_INTERVAL)); PACKET_COUNTER_AVERAGE_INTERVAL));
double send_array_ratio = (((double)npackets) / min_speed);
if (conn->last_congestion_event + CONGESTION_EVENT_TIMEOUT < temp_time) { //TODO: Improve formula?
if (send_array_ratio > 2.0 && CRYPTO_MIN_QUEUE_LENGTH * 3 < npackets) {
conn->packet_send_rate = min_speed * (1.0 / (send_array_ratio / 2.0));
} else if (conn->last_congestion_event + CONGESTION_EVENT_TIMEOUT < temp_time) {
conn->packet_send_rate = min_speed * 1.2; conn->packet_send_rate = min_speed * 1.2;
} else { } else {
conn->packet_send_rate = min_speed * 0.9; conn->packet_send_rate = min_speed * 0.9;
} }
//TODO: find real formula and remove all those magic numbers
if (conn->packet_send_rate * 8 < npackets && CRYPTO_MIN_QUEUE_LENGTH * 8 < npackets) {
conn->packet_send_rate = min_speed * 0.5;
}
if (conn->packet_send_rate < CRYPTO_PACKET_MIN_RATE) { if (conn->packet_send_rate < CRYPTO_PACKET_MIN_RATE) {
conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE; conn->packet_send_rate = CRYPTO_PACKET_MIN_RATE;
} }