pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-23 12:11:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaks to how resend is calculated to help our friends with smoke signal connections

Browse Source
This commit is contained in:
KimLS 2017-04-13 19:40:58 -07:00
parent 1e61252445
commit 6596dfeeba
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
common/net/daybreak_connection.cpp
View File

@ -1,6 +1,7 @@
#include "daybreak_connection.h" #include "daybreak_connection.h"
#include "../event/event_loop.h" #include "../event/event_loop.h"
#include "../eqemu_logsys.h" #include "../eqemu_logsys.h"
#include "../data_verification.h"
#include "crc32.h" #include "crc32.h"
#include <zlib.h> #include <zlib.h>
#include <sstream> #include <sstream>
@ -276,8 +277,8 @@ EQ::Net::DaybreakConnection::DaybreakConnection(DaybreakConnectionManager *owner
m_encode_passes[1] = owner->m_options.encode_passes[1]; m_encode_passes[1] = owner->m_options.encode_passes[1];
m_hold_time = Clock::now(); m_hold_time = Clock::now();
m_buffered_packets_length = 0; m_buffered_packets_length = 0;
m_resend_delay = m_owner->m_options.resend_delay_ms + 25; m_rolling_ping = 500;
m_rolling_ping = 100; m_resend_delay = (m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms;
m_combined.reset(new char[512]); m_combined.reset(new char[512]);
m_combined[0] = 0; m_combined[0] = 0;
m_combined[1] = OP_Combined; m_combined[1] = OP_Combined;
@ -299,8 +300,8 @@ EQ::Net::DaybreakConnection::DaybreakConnection(DaybreakConnectionManager *owner
m_crc_bytes = 0; m_crc_bytes = 0;
m_hold_time = Clock::now(); m_hold_time = Clock::now();
m_buffered_packets_length = 0; m_buffered_packets_length = 0;
m_resend_delay = m_resend_delay = m_owner->m_options.resend_delay_ms + 25; m_rolling_ping = 500;
m_rolling_ping = 100; m_resend_delay = (m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms;
m_combined.reset(new char[512]); m_combined.reset(new char[512]);
m_combined[0] = 0; m_combined[0] = 0;
m_combined[1] = OP_Combined; m_combined[1] = OP_Combined;
@ -355,10 +356,8 @@ void EQ::Net::DaybreakConnection::ResetStats()
void EQ::Net::DaybreakConnection::Process() void EQ::Net::DaybreakConnection::Process()
{ {
try { try {
m_resend_delay = (size_t)(m_stats.last_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms; m_resend_delay = (size_t)(m_rolling_ping * m_owner->m_options.resend_delay_factor) + m_owner->m_options.resend_delay_ms;
if (m_resend_delay > 500) { m_resend_delay = EQEmu::Clamp(m_resend_delay, m_owner->m_options.resend_delay_min, m_owner->m_options.resend_delay_max);
m_resend_delay = 500;
}
auto now = Clock::now(); auto now = Clock::now();
auto time_since_hold = (size_t)std::chrono::duration_cast<std::chrono::milliseconds>(now - m_hold_time).count(); auto time_since_hold = (size_t)std::chrono::duration_cast<std::chrono::milliseconds>(now - m_hold_time).count();
@ -1027,6 +1026,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream)
InternalBufferedSend(entry.second.packet); InternalBufferedSend(entry.second.packet);
entry.second.last_sent = now; entry.second.last_sent = now;
entry.second.times_resent++; entry.second.times_resent++;
m_rolling_ping += 150;
} }
} }
else { else {
@ -1040,6 +1040,7 @@ void EQ::Net::DaybreakConnection::ProcessResend(int stream)
InternalBufferedSend(entry.second.packet); InternalBufferedSend(entry.second.packet);
entry.second.last_sent = now; entry.second.last_sent = now;
entry.second.times_resent++; entry.second.times_resent++;
m_rolling_ping += 150;
} }
} }
} }
@ -1055,13 +1056,15 @@ void EQ::Net::DaybreakConnection::Ack(int stream, uint16_t seq)
auto order = CompareSequence(seq, iter->first); auto order = CompareSequence(seq, iter->first);
if (order != SequenceFuture) { if (order != SequenceFuture) {
uint64_t round_time = (uint64_t)std::chrono::duration_cast<std::chrono::milliseconds>(now - iter->second.last_sent).count(); if (iter->second.times_resent == 0) {
m_stats.total_ping += round_time; uint64_t round_time = (uint64_t)std::chrono::duration_cast<std::chrono::milliseconds>(now - iter->second.last_sent).count();
m_stats.total_acks++;
m_stats.max_ping = std::max(m_stats.max_ping, round_time); m_stats.max_ping = std::max(m_stats.max_ping, round_time);
m_stats.min_ping = std::min(m_stats.min_ping, round_time); m_stats.min_ping = std::min(m_stats.min_ping, round_time);
m_stats.last_ping = round_time; m_stats.last_ping = round_time;
m_rolling_ping = (m_rolling_ping + round_time) / 2; m_rolling_ping = (m_rolling_ping * 2 + round_time) / 3;
}
iter = s->sent_packets.erase(iter); iter = s->sent_packets.erase(iter);
} }
else { else {
@ -1076,13 +1079,15 @@ void EQ::Net::DaybreakConnection::OutOfOrderAck(int stream, uint16_t seq)
auto s = &m_streams[stream]; auto s = &m_streams[stream];
auto iter = s->sent_packets.find(seq); auto iter = s->sent_packets.find(seq);
if (iter != s->sent_packets.end()) { if (iter != s->sent_packets.end()) {
uint64_t round_time = (uint64_t)std::chrono::duration_cast<std::chrono::milliseconds>(now - iter->second.last_sent).count(); if (iter->second.times_resent == 0) {
m_stats.total_ping += round_time; uint64_t round_time = (uint64_t)std::chrono::duration_cast<std::chrono::milliseconds>(now - iter->second.last_sent).count();
m_stats.total_acks++;
m_stats.max_ping = std::max(m_stats.max_ping, round_time); m_stats.max_ping = std::max(m_stats.max_ping, round_time);
m_stats.min_ping = std::min(m_stats.min_ping, round_time); m_stats.min_ping = std::min(m_stats.min_ping, round_time);
m_stats.last_ping = round_time; m_stats.last_ping = round_time;
m_rolling_ping = (m_rolling_ping + round_time) / 2; m_rolling_ping = (m_rolling_ping * 2 + round_time) / 3;
}
s->sent_packets.erase(iter); s->sent_packets.erase(iter);
} }
} }

12
common/net/daybreak_connection.h
View File

@ -78,8 +78,6 @@ namespace EQ
sent_bytes = 0; sent_bytes = 0;
recv_packets = 0; recv_packets = 0;
sent_packets = 0; sent_packets = 0;
total_ping = 0;
total_acks = 0;
min_ping = 0xFFFFFFFFFFFFFFFFUL; min_ping = 0xFFFFFFFFFFFFFFFFUL;
max_ping = 0; max_ping = 0;
created = Clock::now(); created = Clock::now();
@ -89,8 +87,6 @@ namespace EQ
uint64_t sent_bytes; uint64_t sent_bytes;
uint64_t recv_packets; uint64_t recv_packets;
uint64_t sent_packets; uint64_t sent_packets;
uint64_t total_ping;
uint64_t total_acks;
uint64_t min_ping; uint64_t min_ping;
uint64_t max_ping; uint64_t max_ping;
uint64_t last_ping; uint64_t last_ping;
@ -209,10 +205,10 @@ namespace EQ
DaybreakConnectionManagerOptions() { DaybreakConnectionManagerOptions() {
max_connection_count = 0; max_connection_count = 0;
keepalive_delay_ms = 9000; keepalive_delay_ms = 9000;
resend_delay_ms = 50; resend_delay_ms = 300;
resend_delay_factor = 1.5; resend_delay_factor = 1.3;
resend_delay_min = 50; resend_delay_min = 100;
resend_delay_max = 500; resend_delay_max = 2000;
connect_delay_ms = 500; connect_delay_ms = 500;
stale_connection_ms = 90000; stale_connection_ms = 90000;
connect_stale_ms = 5000; connect_stale_ms = 5000;