From: Ben Pfaff Date: Sun, 9 Nov 2008 19:41:18 +0000 (-0800) Subject: Move reboot() and power_off() to new file, and rename to fit convention. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81e99ad722110f1c79396d78a92c14f7799ad032;p=pintos-anon Move reboot() and power_off() to new file, and rename to fit convention. --- diff --git a/solutions/p2.patch b/solutions/p2.patch index 88f7cb7..41f6764 100644 --- a/solutions/p2.patch +++ b/solutions/p2.patch @@ -500,9 +500,9 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +#include "userprog/process.h" +#include "userprog/pagedir.h" +#include "devices/input.h" ++#include "devices/shutdown.h" +#include "filesys/filesys.h" +#include "filesys/file.h" -+#include "threads/init.h" #include "threads/interrupt.h" +#include "threads/malloc.h" +#include "threads/palloc.h" @@ -672,7 +672,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +static int +sys_halt (void) +{ -+ power_off (); ++ shutdown_power_off (); +} + +/* Exit system call. */ diff --git a/solutions/p3.patch b/solutions/p3.patch index a7dafb2..b0d0bf3 100644 --- a/solutions/p3.patch +++ b/solutions/p3.patch @@ -809,10 +809,10 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +#include "userprog/process.h" +#include "userprog/pagedir.h" +#include "devices/input.h" ++#include "devices/shutdown.h" +#include "filesys/directory.h" +#include "filesys/filesys.h" +#include "filesys/file.h" -+#include "threads/init.h" #include "threads/interrupt.h" +#include "threads/malloc.h" +#include "threads/palloc.h" @@ -979,7 +979,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +static int +sys_halt (void) +{ -+ power_off (); ++ shutdown_power_off (); +} + +/* Exit system call. */ diff --git a/solutions/p4.patch b/solutions/p4.patch index 1a66b52..7996c25 100644 --- a/solutions/p4.patch +++ b/solutions/p4.patch @@ -2761,7 +2761,7 @@ Index: src/userprog/syscall.c diff -u src/userprog/syscall.c~ src/userprog/syscall.c --- src/userprog/syscall.c~ +++ src/userprog/syscall.c -@@ -1,20 +1,684 @@ +@@ -1,20 +1,685 @@ #include "userprog/syscall.h" #include +#include @@ -2769,6 +2769,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +#include "userprog/process.h" +#include "userprog/pagedir.h" +#include "devices/input.h" ++#include "devices/shutdown.h" +#include "filesys/directory.h" +#include "filesys/filesys.h" +#include "filesys/file.h" @@ -2974,7 +2975,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c +static int +sys_halt (void) +{ -+ power_off (); ++ shutdown_power_off (); +} + +/* Exit system call. */ diff --git a/src/Makefile.build b/src/Makefile.build index 4bd9220..ceb3412 100644 --- a/src/Makefile.build +++ b/src/Makefile.build @@ -31,6 +31,7 @@ devices_SRC += devices/disk.c # IDE disk device. devices_SRC += devices/input.c # Serial and keyboard input. devices_SRC += devices/intq.c # Interrupt queue. devices_SRC += devices/rtc.c # Real-time clock. +devices_SRC += devices/shutdown.c # Reboot and power off. # Library code shared between kernel and user programs. lib_SRC = lib/debug.c # Debug helpers. diff --git a/src/devices/kbd.c b/src/devices/kbd.c index 1aa71f5..fcc82be 100644 --- a/src/devices/kbd.c +++ b/src/devices/kbd.c @@ -4,7 +4,7 @@ #include #include #include "devices/input.h" -#include "threads/init.h" +#include "devices/shutdown.h" #include "threads/interrupt.h" #include "threads/io.h" @@ -135,7 +135,7 @@ keyboard_interrupt (struct intr_frame *args UNUSED) { /* Reboot if Ctrl+Alt+Del pressed. */ if (c == 0177 && ctrl && alt) - reboot (); + shutdown_reboot (); /* Handle Ctrl, Shift. Note that Ctrl overrides Shift. */ diff --git a/src/devices/shutdown.c b/src/devices/shutdown.c new file mode 100644 index 0000000..fbc662b --- /dev/null +++ b/src/devices/shutdown.c @@ -0,0 +1,100 @@ +#include "devices/shutdown.h" +#include +#include +#include "devices/kbd.h" +#include "devices/serial.h" +#include "devices/timer.h" +#include "threads/io.h" +#include "threads/thread.h" +#ifdef USERPROG +#include "userprog/exception.h" +#endif +#ifdef FILESYS +#include "devices/disk.h" +#include "filesys/filesys.h" +#endif + +/* Keyboard control register port. */ +#define CONTROL_REG 0x64 + +static void print_stats (void); + +/* Reboots the machine via the keyboard controller. */ +void +shutdown_reboot (void) +{ + int i; + + printf ("Rebooting...\n"); + + /* See [kbd] for details on how to program the keyboard + * controller. */ + for (i = 0; i < 100; i++) + { + int j; + + /* Poll keyboard controller's status byte until + * 'input buffer empty' is reported. */ + for (j = 0; j < 0x10000; j++) + { + if ((inb (CONTROL_REG) & 0x02) == 0) + break; + timer_udelay (2); + } + + timer_udelay (50); + + /* Pulse bit 0 of the output port P2 of the keyboard controller. + * This will reset the CPU. */ + outb (CONTROL_REG, 0xfe); + timer_udelay (50); + } +} + +/* Powers down the machine we're running on, + as long as we're running on Bochs or QEMU. */ +void +shutdown_power_off (void) +{ + const char s[] = "Shutdown"; + const char *p; + +#ifdef FILESYS + filesys_done (); +#endif + + print_stats (); + + printf ("Powering off...\n"); + serial_flush (); + + /* This is a special power-off sequence supported by Bochs and + QEMU, but not by physical hardware. */ + for (p = s; *p != '\0'; p++) + outb (0x8900, *p); + + /* This will power off a VMware VM if "gui.exitOnCLIHLT = TRUE" + is set in its configuration file. (The "pintos" script does + that automatically.) */ + asm volatile ("cli; hlt" : : : "memory"); + + /* None of those worked. */ + printf ("still running...\n"); + for (;;); +} + +/* Print statistics about Pintos execution. */ +static void +print_stats (void) +{ + timer_print_stats (); + thread_print_stats (); +#ifdef FILESYS + disk_print_stats (); +#endif + console_print_stats (); + kbd_print_stats (); +#ifdef USERPROG + exception_print_stats (); +#endif +} diff --git a/src/devices/shutdown.h b/src/devices/shutdown.h new file mode 100644 index 0000000..0bc5657 --- /dev/null +++ b/src/devices/shutdown.h @@ -0,0 +1,7 @@ +#ifndef DEVICES_SHUTDOWN_H +#define DEVICES_SHUTDOWN_H + +void shutdown_reboot (void); +void shutdown_power_off (void); + +#endif /* devices/shutdown.h */ diff --git a/src/lib/kernel/debug.c b/src/lib/kernel/debug.c index 2280195..43d8c1e 100644 --- a/src/lib/kernel/debug.c +++ b/src/lib/kernel/debug.c @@ -11,6 +11,7 @@ #include "threads/switch.h" #include "threads/vaddr.h" #include "devices/serial.h" +#include "devices/shutdown.h" /* Halts the OS, printing the source file name, line number, and function name, plus a user-specific message. */ @@ -46,7 +47,7 @@ debug_panic (const char *file, int line, const char *function, serial_flush (); if (power_off_when_done) - power_off (); + shutdown_power_off (); for (;;); } diff --git a/src/threads/init.c b/src/threads/init.c index 8a03705..01eec11 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -11,6 +11,7 @@ #include "devices/kbd.h" #include "devices/input.h" #include "devices/serial.h" +#include "devices/shutdown.h" #include "devices/timer.h" #include "devices/vga.h" #include "devices/rtc.h" @@ -64,9 +65,6 @@ static char **parse_options (char **argv); static void run_actions (char **argv); static void usage (void); -static void print_stats (void); - - int main (void) NO_RETURN; /* Pintos main program. */ @@ -129,10 +127,10 @@ main (void) /* Finish up. */ if (reboot_when_done) - reboot (); + shutdown_reboot (); if (power_off_when_done) - power_off (); + shutdown_power_off (); thread_exit (); } @@ -376,80 +374,5 @@ usage (void) " -ul=COUNT Limit user memory to COUNT pages.\n" #endif ); - power_off (); -} - -/* Keyboard control register port. */ -#define CONTROL_REG 0x64 - -/* Reboots the machine via the keyboard controller. */ -void -reboot (void) -{ - int i; - - printf ("Rebooting...\n"); - - /* See [kbd] for details on how to program the keyboard - * controller. */ - for (i = 0; i < 100; i++) - { - int j; - - /* Poll keyboard controller's status byte until - * 'input buffer empty' is reported. */ - for (j = 0; j < 0x10000; j++) - { - if ((inb (CONTROL_REG) & 0x02) == 0) - break; - timer_udelay (2); - } - - timer_udelay (50); - - /* Pulse bit 0 of the output port P2 of the keyboard controller. - * This will reset the CPU. */ - outb (CONTROL_REG, 0xfe); - timer_udelay (50); - } -} - -/* Powers down the machine we're running on, - as long as we're running on Bochs or QEMU. */ -void -power_off (void) -{ - const char s[] = "Shutdown"; - const char *p; - -#ifdef FILESYS - filesys_done (); -#endif - - print_stats (); - - printf ("Powering off...\n"); - serial_flush (); - - for (p = s; *p != '\0'; p++) - outb (0x8900, *p); - asm volatile ("cli; hlt" : : : "memory"); - printf ("still running...\n"); - for (;;); -} - -/* Print statistics about Pintos execution. */ -static void -print_stats (void) -{ - timer_print_stats (); - thread_print_stats (); -#ifdef FILESYS - disk_print_stats (); -#endif - console_print_stats (); - kbd_print_stats (); -#ifdef USERPROG - exception_print_stats (); -#endif + shutdown_power_off (); }