Better HTTP max_wait calculation.

GitOrigin-RevId: 36a149e8d4a2b46ee5e2d23514a8a78d6ad696fc
This commit is contained in:
levlam 2018-07-27 12:15:29 +03:00
parent 83e28b8ebc
commit 5e6672ee26
2 changed files with 3 additions and 3 deletions

View File

@ -800,8 +800,8 @@ void SessionConnection::flush_packet() {
if (mode_ == Mode::HttpLongPoll) { if (mode_ == Mode::HttpLongPoll) {
max_delay = HTTP_MAX_DELAY; max_delay = HTTP_MAX_DELAY;
max_after = HTTP_MAX_AFTER; max_after = HTTP_MAX_AFTER;
max_wait = min(http_max_wait(), auto time_to_disconnect = ping_disconnect_delay() + last_pong_at_ - Time::now_cached();
static_cast<int>(1000 * max(0.1, ping_disconnect_delay() + last_pong_at_ - Time::now_cached() - 1))); max_wait = min(http_max_wait(), static_cast<int>(1000 * max(0.1, time_to_disconnect - rtt())));
} else if (mode_ == Mode::Http) { } else if (mode_ == Mode::Http) {
max_delay = HTTP_MAX_DELAY; max_delay = HTTP_MAX_DELAY;
max_after = HTTP_MAX_AFTER; max_after = HTTP_MAX_AFTER;

View File

@ -125,7 +125,7 @@ class SessionConnection
bool online_flag_ = false; bool online_flag_ = false;
int rtt() const { int rtt() const {
return max(2, static_cast<int>(raw_connection_->rtt_ * 1.5)); return max(2, static_cast<int>(raw_connection_->rtt_ * 1.5 + 1));
} }
int32 ping_disconnect_delay() const { int32 ping_disconnect_delay() const {