folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Make SLEEP command interruptable with SIGINT

Browse source
This commit is contained in:
Mark Pizzolato 2017-11-07 13:34:53 -08:00
parent e2944eb6e0
commit 733ac0d982
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
doc/simh_doc.doc
View file

Binary file not shown.

12
scp.c
View file

@ -1782,7 +1782,8 @@ ASSERT failure have several different actions:
" Pause for NUMBER seconds. SUFFIX may be 's' for seconds (the default),\n" " Pause for NUMBER seconds. SUFFIX may be 's' for seconds (the default),\n"
" 'm' for minutes, 'h' for hours or 'd' for days. NUMBER may be an\n" " 'm' for minutes, 'h' for hours or 'd' for days. NUMBER may be an\n"
" arbitrary floating point number. Given two or more arguments, pause\n" " arbitrary floating point number. Given two or more arguments, pause\n"
" for the amount of time specified by the sum of their values.\n\n" " for the amount of time specified by the sum of their values.\n"
" NOTE: A SLEEP command is interruptable with SIGINT (^C).\n\n"
/***************** 80 character line width template *************************/ /***************** 80 character line width template *************************/
#define HLP_ASSERT "*Commands Executing_Command_Files Testing_Simulator_State" #define HLP_ASSERT "*Commands Executing_Command_Files Testing_Simulator_State"
#define HLP_IF "*Commands Executing_Command_Files Testing_Simulator_State" #define HLP_IF "*Commands Executing_Command_Files Testing_Simulator_State"
@ -3961,6 +3962,8 @@ t_stat sleep_cmd (int32 flag, CONST char *cptr)
char *tptr; char *tptr;
double wait; double wait;
stop_cpu = 0;
signal (SIGINT, int_handler);
while (*cptr) { while (*cptr) {
wait = strtod (cptr, &tptr); wait = strtod (cptr, &tptr);
switch (*tptr) { switch (*tptr) {
@ -3988,15 +3991,18 @@ while (*cptr) {
wait *= (24.0*60.0*60.0); wait *= (24.0*60.0*60.0);
break; break;
default: default:
signal (SIGINT, SIG_DFL); /* cancel WRU */
return sim_messagef (SCPE_ARG, "Invalid Sleep unit '%c'\n", *cptr); return sim_messagef (SCPE_ARG, "Invalid Sleep unit '%c'\n", *cptr);
} }
wait *= 1000.0; /* Convert to Milliseconds */ wait *= 1000.0; /* Convert to Milliseconds */
cptr = tptr; cptr = tptr;
while (wait > 1000.0) while ((wait > 1000.0) && (!stop_cpu))
wait -= sim_os_ms_sleep (1000); wait -= sim_os_ms_sleep (1000);
if (wait > 0.0) if ((wait > 0.0) && (!stop_cpu))
sim_os_ms_sleep ((unsigned)wait); sim_os_ms_sleep ((unsigned)wait);
} }
signal (SIGINT, SIG_DFL); /* cancel WRU */
stop_cpu = 0;
return SCPE_OK; return SCPE_OK;
} }