david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[monojob] Check for keypresses only once per timer tick 

Checking for keypresses takes a non-negligible amount of time, and
measurably affects our RTT.  Minimise the impact by checking for
keypresses only once per timer tick.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2012-06-28 12:27:43 +01:00
parent ec22e08db1
commit 85917ba8dd
1 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/core/monojob.c
View File

@ -60,7 +60,9 @@ int monojob_wait ( const char *string ) {
struct job_progress progress;
int key;
int rc;
unsigned long last_keycheck;
unsigned long last_progress;
unsigned long now;
unsigned long elapsed;
unsigned long completed;
unsigned long total;
@ -70,20 +72,32 @@ int monojob_wait ( const char *string ) {
if ( string )
printf ( "%s...", string );
monojob_rc = -EINPROGRESS;
last_progress = currticks();
last_keycheck = last_progress = currticks();
while ( monojob_rc == -EINPROGRESS ) {
/* Allow job to progress */
step();
if ( iskey() ) {
key = getchar();
switch ( key ) {
case CTRL_C:
monojob_close ( &monojob, -ECANCELED );
break;
default:
break;
now = currticks();
/* Check for keypresses. This can be time-consuming,
* so check only once per clock tick.
*/
if ( now != last_keycheck ) {
if ( iskey() ) {
key = getchar();
switch ( key ) {
case CTRL_C:
monojob_close ( &monojob, -ECANCELED );
break;
default:
break;
}
}
last_keycheck = now;
}
elapsed = ( currticks() - last_progress );
/* Display progress, if applicable */
elapsed = ( now - last_progress );
if ( string && ( elapsed >= TICKS_PER_SEC ) ) {
if ( shown_percentage )
printf ( "\b\b\b\b \b\b\b\b" );
@ -99,7 +113,7 @@ int monojob_wait ( const char *string ) {
printf ( "." );
shown_percentage = 0;
}
last_progress = currticks();
last_progress = now;
}
}
rc = monojob_rc;