sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-19 19:49:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

[monojob] Add timeout parameter to monojob_wait()

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2013-11-01 01:55:13 +00:00
parent 5674a3c087
commit d1be9f4acc
8 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/monojob.c
View File

@@ -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" );