From 3d2676ace0f345407bcaab449d2ad70f9635b611 Mon Sep 17 00:00:00 2001 From: Keith Winstein Date: Fri, 3 Feb 2012 22:17:07 -0500 Subject: [PATCH] Correct sense of comparison for prediction expiration --- terminaloverlay.cpp | 6 +++--- transportsender.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/terminaloverlay.cpp b/terminaloverlay.cpp index 2071377..cf35736 100644 --- a/terminaloverlay.cpp +++ b/terminaloverlay.cpp @@ -11,7 +11,7 @@ using namespace Overlay; 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)) ) { - expiration_time = now + 25 + 125 * send_interval / 100; + expiration_time = now + 50 + 125 * send_interval / 100; return true; } return false; @@ -95,7 +95,7 @@ Validity ConditionalOverlayCell::get_validity( const Framebuffer &fb, int row, assert( expiration_time != uint64_t(-1) ); if ( (late_ack >= expiration_frame) - || ( (sent_frame <= early_ack) && (expiration_time >= now) ) ) { + || ( (sent_frame <= early_ack) && (expiration_time <= now) ) ) { return IncorrectOrExpired; } @@ -127,7 +127,7 @@ Validity ConditionalCursorMove::get_validity( const Framebuffer &fb, uint64_t se assert( expiration_time != uint64_t(-1) ); if ( (late_ack >= expiration_frame) - || ( (sent_frame <= early_ack) && (expiration_time >= now) ) ) { + || ( (sent_frame <= early_ack) && (expiration_time <= now) ) ) { return IncorrectOrExpired; } diff --git a/transportsender.cpp b/transportsender.cpp index 3bb8343..02c9109 100644 --- a/transportsender.cpp +++ b/transportsender.cpp @@ -241,9 +241,9 @@ void TransportSender::send_in_fragments( string diff, uint64_t new_num connection->send( i->tostring() ); 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, - (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(), (int)connection->timeout(), connection->get_SRTT(), (long long)(now - ack_timestamp) );