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

Better timestamping -- now send opportunistically

Browse Source
This commit is contained in:
Keith Winstein
2011-09-13 02:08:58 -04:00
parent 823dc58891
commit f3b9c60196
5 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
transportsender.cpp
+8 -5
View File
@@ -14,7 +14,8 @@ TransportSender<MyState>::TransportSender( Connection *s_connection, MyState &in
next_send_time( timestamp() ),
verbose( false ),
shutdown_in_progress( false ),
ack_num( 0 )
ack_num( 0 ),
pending_data_ack( false )
{
}
@@ -36,7 +37,7 @@ unsigned int TransportSender<MyState>::send_interval( void )
template <class MyState>
int TransportSender<MyState>::wait_time( void )
{
if ( connection->pending_timestamp() && ( next_ack_time > timestamp() + ACK_DELAY ) ) {
if ( pending_data_ack && (next_ack_time > timestamp() + ACK_DELAY) ) {
next_ack_time = timestamp() + ACK_DELAY;
}
@@ -120,7 +121,7 @@ void TransportSender<MyState>::send_empty_ack( void )
new_num = uint64_t( -1 );
}
send_in_fragments( "", new_num, false );
send_in_fragments( "", new_num );
sent_states.push_back( TimestampedState<MyState>( sent_states.back().timestamp, new_num, current_state ) );
next_ack_time = timestamp() + ACK_INTERVAL;
}
@@ -215,7 +216,7 @@ void TransportSender<MyState>::rationalize_states( void )
}
template <class MyState>
void TransportSender<MyState>::send_in_fragments( string diff, uint64_t new_num, bool send_timestamp )
void TransportSender<MyState>::send_in_fragments( string diff, uint64_t new_num )
{
Instruction inst;
inst.set_old_num( assumed_receiver_state->num );
@@ -227,7 +228,7 @@ void TransportSender<MyState>::send_in_fragments( string diff, uint64_t new_num,
vector<Fragment> fragments = fragmenter.make_fragments( inst, connection->get_MTU() );
for ( auto i = fragments.begin(); i != fragments.end(); i++ ) {
connection->send( i->tostring(), send_timestamp );
connection->send( i->tostring() );
if ( verbose ) {
fprintf( stderr, "[%d] Sent [%d=>%d] id %d, frag %d ack=%d, throwaway=%d, len=%d, frame rate=%.2f, timeout=%d\n",
@@ -238,6 +239,8 @@ void TransportSender<MyState>::send_in_fragments( string diff, uint64_t new_num,
}
}
pending_data_ack = false;
}
template <class MyState>