izackp/mosh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in retransmission logic (improves performance on lossy links)

Browse Source
This commit is contained in:
Keith Winstein
2012-05-02 15:11:36 -04:00
parent 2ea3f3a347
commit ce47d1f769
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/transportsender.cc
+19 -13
View File
@@ -44,7 +44,8 @@ TransportSender<MyState>::TransportSender( Connection *s_connection, MyState &in
pending_data_ack( false ), pending_data_ack( false ),
SEND_MINDELAY( 8 ), SEND_MINDELAY( 8 ),
last_heard( 0 ), last_heard( 0 ),
prng() prng(),
mindelay_clock( -1 )
{ {
} }
@@ -78,16 +79,22 @@ void TransportSender<MyState>::calculate_timers( void )
next_ack_time = now + ACK_DELAY; next_ack_time = now + ACK_DELAY;
} }
if ( ( !(current_state == assumed_receiver_state->state) if ( !(current_state == sent_states.back().state) ) {
&& (last_heard + ACTIVE_RETRY_TIMEOUT > now) ) if ( mindelay_clock == uint64_t( -1 ) ) {
|| !(current_state == sent_states.back().state) ) { /* pending data to send */ mindelay_clock = now;
if ( next_send_time > now + SEND_MINDELAY ) {
next_send_time = now + SEND_MINDELAY;
} }
if ( next_send_time < sent_states.back().timestamp + send_interval() ) { next_send_time = max( mindelay_clock + SEND_MINDELAY,
next_send_time = sent_states.back().timestamp + send_interval(); sent_states.back().timestamp + send_interval() );
} else if ( !(current_state == assumed_receiver_state->state)
&& (last_heard + ACTIVE_RETRY_TIMEOUT > now) ) {
next_send_time = sent_states.back().timestamp + send_interval();
if ( mindelay_clock != uint64_t( -1 ) ) {
next_send_time = max( next_send_time, mindelay_clock + SEND_MINDELAY );
} }
} else if ( !(current_state == sent_states.front().state )
&& (last_heard + ACTIVE_RETRY_TIMEOUT > now) ) {
next_send_time = sent_states.back().timestamp + connection->timeout() + ACK_DELAY;
} else { } else {
next_send_time = uint64_t(-1); next_send_time = uint64_t(-1);
} }
@@ -152,16 +159,15 @@ void TransportSender<MyState>::tick( void )
} }
*/ */
if ( diff.empty() && (now >= next_ack_time) ) { if ( diff.empty() && (now >= next_ack_time) ) {
send_empty_ack(); send_empty_ack();
return; mindelay_clock = uint64_t( -1 );
} } else if ( !diff.empty() && ( (now >= next_send_time)
if ( !diff.empty() && ( (now >= next_send_time)
|| (now >= next_ack_time) ) ) { || (now >= next_ack_time) ) ) {
/* Send diffs or ack */ /* Send diffs or ack */
send_to_receiver( diff ); send_to_receiver( diff );
return; mindelay_clock = uint64_t( -1 );
} }
} }
src/network/transportsender.h
+2
View File
@@ -92,6 +92,8 @@ namespace Network {
PRNG prng; PRNG prng;
const string make_chaff( void ); const string make_chaff( void );
uint64_t mindelay_clock; /* time of first pending change to current state */
public: public:
/* constructor */ /* constructor */
TransportSender( Connection *s_connection, MyState &initial_state ); TransportSender( Connection *s_connection, MyState &initial_state );