sleep.mod
PATCH 1/1 sleep.mod
A sleep command.
Signature · 5 lines
Robert Millan <GPLv2> I know my rights; I want my phone call! <DRM> What use is a phone call… if you are unable to speak? (as seen on /.)
commands/sleep.c renamed from grub2/commands/sleep.c +110 -0
@@ -0,0 +1,110 @@ +/* sleep.c - Command to wait a specified number of seconds. */ +/* +* GRUB -- GRand Unified Bootloader +* Copyright (C) 2006,2007,2008 Free Software Foundation, Inc. +* +* GRUB 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 3 of the License, or +* (at your option) any later version. +* +* GRUB 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 GRUB. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <grub/dl.h> +#include <grub/term.h> +#include <grub/types.h> +#include <grub/misc.h> +#include <grub/normal.h> +#include <grub/machine/time.h> + +static const struct grub_arg_option options[] = + { + {"verbose" ,'v' ,0 ,"verbose countdown" ,0 ,0 }, + {"interruptible" ,'i' ,0 ,"interruptible with ESC" ,0 ,0 }, + {0 ,0 ,0 ,0 ,0 ,0 } + }; + +static grub_uint8_t x, y; + +static void +do_print (int n) +{ +grub_gotoxy (x, y); +/* NOTE: Do not remove the trailing space characters. +They are required to clear the line. */ +grub_printf ("%d " , n); +} + +/* Based on grub_millisleep() from kern/misc.c. */ +static int +grub_interruptible_millisleep (grub_uint32_t ms) +{ +grub_uint32_t end_at; + + end_at =grub_get_rtc () +grub_div_roundup (ms *GRUB_TICKS_PER_SECOND ,1000 ); + +while (grub_get_rtc () < end_at) +if (GRUB_TERM_ASCII_CHAR (grub_checkkey ()) ==GRUB_TERM_ESC ) +return 1 ; + +return 0 ; +} + +static grub_err_t +grub_cmd_sleep (struct grub_arg_list *state,int argc,char **args) +{ +grub_uint16_t xy; +int n; + +if (argc !=1 ) +return grub_error (GRUB_ERR_BAD_ARGUMENT ,"missing operand" ); + + n =grub_strtoul (args[0 ],0 ,10 ); + +if (n ==0 ) + { +/* Either `0' or broken input. */ +return 0 ; + } + + xy =grub_getxy (); + x = xy >>8 ; + y = xy &0xff ; + +for (; n; n--) + { +if (state[0 ].set) +do_print (n); + +if (state[1 ].set) + { +if (grub_interruptible_millisleep (1000 )) +return 1 ; + } +else +grub_millisleep (1000 ); + } +if (state[0 ].set) +do_print (0 ); + +return 0 ; +} + + +GRUB_MOD_INIT (sleep) +{ +grub_register_command ("sleep" , grub_cmd_sleep,GRUB_COMMAND_FLAG_BOTH , +"sleep NUMBER_OF_SECONDS" ,"Wait for a specified number of seconds" , options); +} + +GRUB_MOD_FINI (sleep) +{ +grub_unregister_command ("sleep" ); +}
conf/common.rmk renamed from grub2/conf/common.rmk +6 -1
@@ -265,7 +265,7 @@ pkglib_MODULES += hello.mod boot.mod ter cmp.mod cat.mod help.mod font.mod search.mod \ loopback.mod configfile.mod echo.mod \ terminfo.mod test.mod blocklist.mod hexdump.mod \ - read.mod + read.mod sleep.mod # For hello.mod. hello_mod_SOURCES = hello/hello.c
@@ -364,3 +364,8 @@ gzio_mod_LDFLAGS = $(COMMON_LDFLAGS) read_mod_SOURCES = commands/read.c read_mod_CFLAGS = $(COMMON_CFLAGS) read_mod_LDFLAGS = $(COMMON_LDFLAGS) + +# For sleep.mod. +sleep_mod_SOURCES = commands/sleep.c +sleep_mod_CFLAGS = $(COMMON_CFLAGS) +sleep_mod_LDFLAGS = $(COMMON_LDFLAGS)
Committed.
Signature · 5 lines
Robert Millan <GPLv2> I know my rights; I want my phone call! <DRM> What use is a phone call… if you are unable to speak? (as seen on /.)
commands/sleep.c line 58
Quoted 13 lines · Robert Millan
commands/sleep.c renamed from grub2/commands/sleep.c +13
-0+static int +grub_interruptible_millisleep (grub_uint32_t ms) +{ +grub_uint32_t end_at; + + end_at =grub_get_rtc () +grub_div_roundup (ms *GRUB_TICKS_PER_SECOND ,1000 ); + +while (grub_get_rtc () < end_at) +if (GRUB_TERM_ASCII_CHAR (grub_checkkey ()) ==GRUB_TERM_ESC ) +return 1 ; + +return 0 ; +}
I have a few issues with this on a EFI machine:
- if I press any other key but ESC, the sleep command is not interruptible anymore
- the keys I press are read when the command returns
Does this happen on other machines as well ?
Alex
Quoted 6 lines · Alexandre Boeglin
I have a few issues with this on a EFI machine:
- if I press any other key but ESC, the sleep command is not interruptible anymore
- the keys I press are read when the command returnsDoes this happen on other machines as well ?
It must be consistent with all architectures, since the terminal API assumes a FIFO buffer for key inputs.
Anyway, I don't like the current implementation of sleep. Robert, are you going to change it according to our discussion?
Okuji
Quoted 3 lines · Yoshinori K. Okuji
Anyway, I don't like the current implementation of sleep. Robert, are you going to change it according to our discussion?
Sorry, I was going to do that, then my time completely disappeared with other stuff. Please don't interpret this as refusal to change it.
I'll try to have a look later (if noone beats me to it).
Signature · 5 lines
Robert Millan <GPLv2> I know my rights; I want my phone call! <DRM> What use is a phone call… if you are unable to speak? (as seen on /.)
Quoted 6 lines · Robert Millan
Quoted 2 lines · Yoshinori K. Okuji
Anyway, I don't like the current implementation of sleep. Robert, are you going to change it according to our discussion?
Sorry, I was going to do that, then my time completely disappeared with other stuff. Please don't interpret this as refusal to change it.
No problem. I was just wondering your intention.
Quoted 1 line
I'll try to have a look later (if noone beats me to it).
Thanks.
Okuji