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

[libc] Make sleep() interruptible 

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2016-03-22 16:12:32 +00:00
parent 860d5904fb
commit ee3122bc54
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/exec.c
View File

@ -36,10 +36,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <ipxe/command.h>
#include <ipxe/parseopt.h>
#include <ipxe/settings.h>
#include <ipxe/console.h>
#include <ipxe/keys.h>
#include <ipxe/process.h>
#include <ipxe/nap.h>
#include <ipxe/shell.h>
/** @file
@ -573,8 +569,6 @@ static struct command_descriptor sleep_cmd =
static int sleep_exec ( int argc, char **argv ) {
struct sleep_options opts;
unsigned int seconds;
unsigned long start;
unsigned long delay;
int rc;
/* Parse options */
@ -586,14 +580,8 @@ static int sleep_exec ( int argc, char **argv ) {
return rc;
/* Delay for specified number of seconds */
start = currticks();
delay = ( seconds * TICKS_PER_SEC );
while ( ( currticks() - start ) <= delay ) {
step();
if ( iskey() && ( getchar() == CTRL_C ) )
return -ECANCELED;
cpu_nap();
}
if ( sleep ( seconds ) != 0 )
return -ECANCELED;
return 0;
}

22
src/core/timer.c
View File

@ -24,6 +24,10 @@
FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
#include <unistd.h>
#include <ipxe/process.h>
#include <ipxe/console.h>
#include <ipxe/keys.h>
#include <ipxe/nap.h>
/**
* Delay for a fixed number of milliseconds
@ -36,12 +40,24 @@ void mdelay ( unsigned long msecs ) {
}
/**
* Delay for a fixed number of seconds
* Sleep (interruptibly) for a fixed number of seconds
*
* @v secs Number of seconds for which to delay
* @ret secs Number of seconds remaining, if interrupted
*/
unsigned int sleep ( unsigned int secs ) {
while ( secs-- )
mdelay ( 1000 );
unsigned long start = currticks();
unsigned long now;
for ( ; secs ; secs-- ) {
while ( ( ( now = currticks() ) - start ) < TICKS_PER_SEC ) {
step();
if ( iskey() && ( getchar() == CTRL_C ) )
return secs;
cpu_nap();
}
start = now;
}
return 0;
}