Files
ipxe/src/core/monojob.c
T
Michael Brown b850a6be28 [monojob] Reset timeout when progress is made
Redefine the timeout parameter from "time since start of job" to "time
since progress was last made".  This does not affect any existing
behaviour, since all existing users of the timeout parameter do not
provide progress indication.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
2014-03-10 13:16:18 +00:00

153 lines
3.8 KiB
C

/*
* Copyright (C) 2007 Michael Brown <mbrown@fensystems.co.uk>.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or any later version.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
FILE_LICENCE ( GPL2_OR_LATER );
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <ipxe/process.h>
#include <ipxe/console.h>
#include <ipxe/keys.h>
#include <ipxe/job.h>
#include <ipxe/monojob.h>
#include <ipxe/timer.h>
/** @file
*
* Single foreground job
*
*/
static int monojob_rc;
static void monojob_close ( struct interface *intf, int rc ) {
monojob_rc = rc;
intf_restart ( intf, rc );
}
static struct interface_operation monojob_intf_op[] = {
INTF_OP ( intf_close, struct interface *, monojob_close ),
};
static struct interface_descriptor monojob_intf_desc =
INTF_DESC_PURE ( monojob_intf_op );
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, unsigned long timeout ) {
struct job_progress progress;
unsigned long last_keycheck;
unsigned long last_progress;
unsigned long last_display;
unsigned long now;
unsigned long elapsed;
unsigned long completed = 0;
unsigned long scaled_completed;
unsigned long scaled_total;
unsigned int percentage;
int shown_percentage = 0;
int ongoing_rc;
int key;
int rc;
if ( string )
printf ( "%s...", string );
monojob_rc = -EINPROGRESS;
last_keycheck = last_progress = last_display = currticks();
while ( monojob_rc == -EINPROGRESS ) {
/* Allow job to progress */
step();
now = currticks();
/* Check for keypresses. This can be time-consuming,
* so check only once per clock tick.
*/
elapsed = ( now - last_keycheck );
if ( elapsed ) {
if ( iskey() ) {
key = getchar();
if ( key == CTRL_C ) {
monojob_rc = -ECANCELED;
break;
}
}
last_keycheck = now;
}
/* Monitor progress */
ongoing_rc = job_progress ( &monojob, &progress );
/* Reset timeout if progress has been made */
if ( completed != progress.completed )
last_progress = now;
completed = progress.completed;
/* Check for timeout, if applicable */
elapsed = ( now - last_progress );
if ( timeout && ( elapsed >= timeout ) ) {
monojob_rc = ( ongoing_rc ? ongoing_rc : -ETIMEDOUT );
break;
}
/* Display progress, if applicable */
elapsed = ( now - last_display );
if ( string && ( elapsed >= TICKS_PER_SEC ) ) {
if ( shown_percentage )
printf ( "\b\b\b\b \b\b\b\b" );
/* Normalise progress figures to avoid overflow */
scaled_completed = ( progress.completed / 128 );
scaled_total = ( progress.total / 128 );
if ( scaled_total ) {
percentage = ( ( 100 * scaled_completed ) /
scaled_total );
printf ( "%3d%%", percentage );
shown_percentage = 1;
} else {
printf ( "." );
shown_percentage = 0;
}
last_display = now;
}
}
rc = monojob_rc;
monojob_close ( &monojob, rc );
if ( shown_percentage )
printf ( "\b\b\b\b \b\b\b\b" );
if ( string ) {
if ( rc ) {
printf ( " %s\n", strerror ( rc ) );
} else {
printf ( " ok\n" );
}
}
return rc;
}