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

Further improvements to typeahead prediction

Browse Source
This commit is contained in:
Keith Winstein
2011-10-13 22:07:53 -04:00
parent d2a6ebf0a1
commit 4042ab88ae
1 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
terminaloverlay.cpp
+28 -15
View File
@@ -109,8 +109,8 @@ void PredictionEngine::cull( const Framebuffer &fb )
RTTVAR = R / 2; RTTVAR = R / 2;
RTT_hit = true; RTT_hit = true;
} else { } else {
const double alpha = 1.0 / 8.0; const double alpha = 1.0 / 32.0;
const double beta = 1.0 / 4.0; const double beta = 1.0 / 16.0;
RTTVAR = (1 - beta) * RTTVAR + ( beta * fabs( SRTT - R ) ); RTTVAR = (1 - beta) * RTTVAR + ( beta * fabs( SRTT - R ) );
SRTT = (1 - alpha) * SRTT + ( alpha * R ); SRTT = (1 - alpha) * SRTT + ( alpha * R );
@@ -340,20 +340,33 @@ void PredictionEngine::new_user_byte( char the_byte, const Framebuffer &fb )
const Cell *existing_cell = fb.get_cell( ccm->new_row, ccm->new_col ); const Cell *existing_cell = fb.get_cell( ccm->new_row, ccm->new_col );
ConditionalOverlayCell *coc = new ConditionalOverlayCell( now + prediction_len(), if ( (existing_cell->contents.size() == 1)
ccm->new_row, ccm->new_col, && (existing_cell->contents.front() == the_byte) ) {
existing_cell->renditions.background_color, /* do nothing */
*existing_cell ); } else if ( (existing_cell->contents.empty() || ((existing_cell->contents.size() == 1)
&& ( (existing_cell->contents.front() == 0x20)
|| (existing_cell->contents.front() == 0xA0) )))
&& ( the_byte == 0x20 ) ) {
/* don't attempt to change existing blank or space cells if user has typed space */
} else {
Renditions current_renditions = fb.ds.get_renditions();
ConditionalOverlayCell *coc = new ConditionalOverlayCell( now + prediction_len(),
ccm->new_row, ccm->new_col,
current_renditions.background_color,
*existing_cell );
coc->replacement = *existing_cell; coc->replacement = *existing_cell;
coc->replacement.contents.clear(); coc->replacement.renditions = current_renditions;
coc->replacement.contents.push_back( the_byte ); coc->replacement.contents.clear();
coc->flag = flagging; coc->replacement.contents.push_back( the_byte );
coc->flag = flagging;
elements.push_back( coc );
}
ccm->new_col++; ccm->new_col++;
ccm->expiration_time = now + prediction_len(); ccm->expiration_time = now + prediction_len();
elements.push_back( coc );
} else { } else {
clear(); clear();
score = 0; score = 0;
@@ -388,11 +401,11 @@ int OverlayManager::wait_time( void )
int PredictionEngine::prediction_len( void ) int PredictionEngine::prediction_len( void )
{ {
uint64_t RTO = lrint( ceil( 1.5 * SRTT + 10 * RTTVAR ) ); uint64_t RTO = lrint( ceil( 1.5 * SRTT + 8 * RTTVAR ) );
if ( RTO < 20 ) { if ( RTO < 20 ) {
RTO = 20; RTO = 20;
} else if ( RTO > 2000 ) { } else if ( RTO > 4000 ) {
RTO = 2000; RTO = 4000;
} }
return RTO; return RTO;
} }