diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/monojob.c | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/src/core/monojob.c b/src/core/monojob.c index d262f70b2..94ed74c0f 100644 --- a/src/core/monojob.c +++ b/src/core/monojob.c @@ -55,12 +55,12 @@ struct interface monojob = INTF_INIT ( monojob_intf_desc ); * Wait for single foreground job to complete * * @v string Job description to display, or NULL to be silent + * @v timeout Timeout period, in ticks (0=indefinite) * @ret rc Job final status code */ -int monojob_wait ( const char *string ) { +int monojob_wait ( const char *string, unsigned long timeout ) { struct job_progress progress; - int key; - int rc; + unsigned long start; unsigned long last_keycheck; unsigned long last_progress; unsigned long now; @@ -69,11 +69,13 @@ int monojob_wait ( const char *string ) { unsigned long total; unsigned int percentage; int shown_percentage = 0; + int key; + int rc; if ( string ) printf ( "%s...", string ); monojob_rc = -EINPROGRESS; - last_keycheck = last_progress = currticks(); + last_keycheck = last_progress = start = currticks(); while ( monojob_rc == -EINPROGRESS ) { /* Allow job to progress */ @@ -83,20 +85,25 @@ int monojob_wait ( const char *string ) { /* Check for keypresses. This can be time-consuming, * so check only once per clock tick. */ - if ( now != last_keycheck ) { + elapsed = ( now - last_keycheck ); + if ( elapsed ) { if ( iskey() ) { key = getchar(); - switch ( key ) { - case CTRL_C: - monojob_close ( &monojob, -ECANCELED ); - break; - default: + if ( key == CTRL_C ) { + monojob_rc = -ECANCELED; break; } } last_keycheck = now; } + /* Check for timeout, if applicable */ + elapsed = ( now - start ); + if ( timeout && ( elapsed >= timeout ) ) { + monojob_rc = -ETIMEDOUT; + break; + } + /* Display progress, if applicable */ elapsed = ( now - last_progress ); if ( string && ( elapsed >= TICKS_PER_SEC ) ) { @@ -118,6 +125,7 @@ int monojob_wait ( const char *string ) { } } rc = monojob_rc; + monojob_close ( &monojob, rc ); if ( shown_percentage ) printf ( "\b\b\b\b \b\b\b\b" ); |