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

Optimize out use of sgr() by storing rendition instead (11% speedup)

Browse Source
This commit is contained in:
Keith Winstein
2012-03-14 01:11:47 -04:00
parent c6c6f8bea0
commit 561a2be761
3 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/examples/benchmark.cc
+1 -1
View File
@@ -48,7 +48,7 @@ extern "C" {
#include "user.h" #include "user.h"
#include "terminaloverlay.h" #include "terminaloverlay.h"
const int ITERATIONS = 100000; const int ITERATIONS = 1000;
int main( void ) int main( void )
{ {
src/terminal/terminaldisplay.cc
+15 -11
View File
@@ -25,6 +25,12 @@ using namespace Terminal;
/* Print a new "frame" to the terminal, using ANSI/ECMA-48 escape codes. */ /* Print a new "frame" to the terminal, using ANSI/ECMA-48 escape codes. */
static const Renditions & initial_rendition( void )
{
const static Renditions blank = Renditions( 0 );
return blank;
}
std::string Display::new_frame( bool initialized, const Framebuffer &last, const Framebuffer &f ) const std::string Display::new_frame( bool initialized, const Framebuffer &last, const Framebuffer &f ) const
{ {
FrameState frame( last ); FrameState frame( last );
@@ -67,11 +73,11 @@ std::string Display::new_frame( bool initialized, const Framebuffer &last, const
frame.append( "\033[0m\033[H\033[2J" ); frame.append( "\033[0m\033[H\033[2J" );
initialized = false; initialized = false;
frame.cursor_x = frame.cursor_y = 0; frame.cursor_x = frame.cursor_y = 0;
frame.current_rendition_string = "\033[0m"; frame.current_rendition = initial_rendition();
} else { } else {
frame.cursor_x = frame.last_frame.ds.get_cursor_col(); frame.cursor_x = frame.last_frame.ds.get_cursor_col();
frame.cursor_y = frame.last_frame.ds.get_cursor_row(); frame.cursor_y = frame.last_frame.ds.get_cursor_row();
frame.current_rendition_string = frame.last_frame.ds.get_renditions().sgr(); frame.current_rendition = frame.last_frame.ds.get_renditions();
} }
/* shortcut -- has display moved up by a certain number of lines? */ /* shortcut -- has display moved up by a certain number of lines? */
@@ -111,9 +117,9 @@ std::string Display::new_frame( bool initialized, const Framebuffer &last, const
frame.append_silent_move( f.ds.get_height() - 1, 0 ); frame.append_silent_move( f.ds.get_height() - 1, 0 );
} }
if ( frame.current_rendition_string != "\033[0m" ) { if ( !(frame.current_rendition == initial_rendition()) ) {
frame.append( "\033[0m" ); frame.append( "\033[0m" );
frame.current_rendition_string = "\033[0m"; frame.current_rendition = initial_rendition();
} }
for ( int i = 0; i < lines_scrolled; i++ ) { for ( int i = 0; i < lines_scrolled; i++ ) {
@@ -193,9 +199,9 @@ std::string Display::new_frame( bool initialized, const Framebuffer &last, const
/* have renditions changed? */ /* have renditions changed? */
if ( (!initialized) if ( (!initialized)
|| (f.ds.get_renditions().sgr() != frame.current_rendition_string) ) { || !(f.ds.get_renditions() == frame.current_rendition) ) {
frame.appendstring( f.ds.get_renditions().sgr() ); frame.appendstring( f.ds.get_renditions().sgr() );
frame.current_rendition_string = f.ds.get_renditions().sgr(); frame.current_rendition = f.ds.get_renditions();
} }
return frame.str; return frame.str;
@@ -217,12 +223,10 @@ void Display::put_cell( bool initialized, FrameState &frame, const Framebuffer &
frame.append_silent_move( frame.y, frame.x ); frame.append_silent_move( frame.y, frame.x );
} }
std::string rendition_str = cell->renditions.sgr(); if ( !(frame.current_rendition == cell->renditions) ) {
if ( frame.current_rendition_string != rendition_str ) {
/* print renditions */ /* print renditions */
frame.appendstring( rendition_str ); frame.appendstring( cell->renditions.sgr() );
frame.current_rendition_string = rendition_str; frame.current_rendition = cell->renditions;
} }
if ( cell->contents.empty() ) { if ( cell->contents.empty() ) {
src/terminal/terminaldisplay.h
+2 -2
View File
@@ -29,13 +29,13 @@ namespace Terminal {
std::string str; std::string str;
int cursor_x, cursor_y; int cursor_x, cursor_y;
std::string current_rendition_string; Renditions current_rendition;
Framebuffer last_frame; Framebuffer last_frame;
FrameState( const Framebuffer &s_last ) FrameState( const Framebuffer &s_last )
: x(0), y(0), : x(0), y(0),
str(), cursor_x(0), cursor_y(0), current_rendition_string(), str(), cursor_x(0), cursor_y(0), current_rendition( 0 ),
last_frame( s_last ) last_frame( s_last )
{ {
str.reserve( 1024 ); str.reserve( 1024 );