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

Correct sense of comparison for prediction expiration

Browse Source
This commit is contained in:
Keith Winstein
2012-02-03 22:17:07 -05:00
parent f4817998f3
commit 3d2676ace0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terminaloverlay.cpp
+3 -3
View File
@@ -11,7 +11,7 @@ using namespace Overlay;
bool ConditionalOverlay::start_clock( uint64_t local_frame_acked, uint64_t now, unsigned int send_interval ) bool ConditionalOverlay::start_clock( uint64_t local_frame_acked, uint64_t now, unsigned int send_interval )
{ {
if ( (local_frame_acked >= expiration_frame) && (expiration_time == uint64_t(-1)) ) { if ( (local_frame_acked >= expiration_frame) && (expiration_time == uint64_t(-1)) ) {
expiration_time = now + 25 + 125 * send_interval / 100; expiration_time = now + 50 + 125 * send_interval / 100;
return true; return true;
} }
return false; return false;
@@ -95,7 +95,7 @@ Validity ConditionalOverlayCell::get_validity( const Framebuffer &fb, int row,
assert( expiration_time != uint64_t(-1) ); assert( expiration_time != uint64_t(-1) );
if ( (late_ack >= expiration_frame) if ( (late_ack >= expiration_frame)
|| ( (sent_frame <= early_ack) && (expiration_time >= now) ) ) { || ( (sent_frame <= early_ack) && (expiration_time <= now) ) ) {
return IncorrectOrExpired; return IncorrectOrExpired;
} }
@@ -127,7 +127,7 @@ Validity ConditionalCursorMove::get_validity( const Framebuffer &fb, uint64_t se
assert( expiration_time != uint64_t(-1) ); assert( expiration_time != uint64_t(-1) );
if ( (late_ack >= expiration_frame) if ( (late_ack >= expiration_frame)
|| ( (sent_frame <= early_ack) && (expiration_time >= now) ) ) { || ( (sent_frame <= early_ack) && (expiration_time <= now) ) ) {
return IncorrectOrExpired; return IncorrectOrExpired;
} }
transportsender.cpp
+2 -2
View File
@@ -241,9 +241,9 @@ void TransportSender<MyState>::send_in_fragments( string diff, uint64_t new_num
connection->send( i->tostring() ); connection->send( i->tostring() );
if ( verbose ) { if ( verbose ) {
fprintf( stderr, "[%u] Sent [%d=>%d] id %d, frag %d ack=%d, throwaway=%d, len=%d, frame rate=%.2f, timeout=%d, srtt=%.1f age=%llu\n", fprintf( stderr, "[%u] Sent [%d=>%d] id %d, frag %d ack=%d, late_ack=%d, throwaway=%d, len=%d, frame rate=%.2f, timeout=%d, srtt=%.1f age=%llu\n",
(unsigned int)(timestamp() % 100000), (int)inst.old_num(), (int)inst.new_num(), (int)i->id, (int)i->fragment_num, (unsigned int)(timestamp() % 100000), (int)inst.old_num(), (int)inst.new_num(), (int)i->id, (int)i->fragment_num,
(int)inst.ack_num(), (int)inst.throwaway_num(), (int)i->contents.size(), (int)inst.ack_num(), (int)inst.late_ack_num(), (int)inst.throwaway_num(), (int)i->contents.size(),
1000.0 / (double)send_interval(), 1000.0 / (double)send_interval(),
(int)connection->timeout(), connection->get_SRTT(), (int)connection->timeout(), connection->get_SRTT(),
(long long)(now - ack_timestamp) ); (long long)(now - ack_timestamp) );