X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=55a8cbb5f363f9f140149bedc7fd90f8a74a3178;hb=911b7dc454511ac5ca905be0be28fc2806ce4514;hp=dbfd56be94be1af05439bbdaed05784a27581214;hpb=b0a700d18f0a0a8c87e1a4fff3a2108e0edb0fbc;p=pintos-anon diff --git a/src/threads/init.c b/src/threads/init.c index dbfd56b..55a8cbb 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -21,6 +21,7 @@ #include "threads/test.h" #include "threads/thread.h" #ifdef USERPROG +#include "userprog/process.h" #include "userprog/exception.h" #include "userprog/gdt.h" #include "userprog/syscall.h" @@ -39,49 +40,55 @@ size_t ram_pages; uint32_t *base_page_dir; #ifdef FILESYS -/* Format the filesystem? */ +/* -f: Format the filesystem? */ static bool format_filesys; #endif #ifdef USERPROG -/* Initial program to run. */ +/* -ex: Initial program to run. */ static char *initial_program; #endif -/* Power off after running requested actions? */ -static bool power_off; +/* -q: Power off after kernel tasks complete? */ +bool power_off_when_done; static void ram_init (void); static void paging_init (void); static void argv_init (void); -static void do_power_off (void); +static void print_stats (void); int main (void) NO_RETURN; int main (void) { - /* Initialize everything needed for printf() first. */ + /* Clear BSS and get machine's RAM size. */ ram_init (); + + /* Initialize ourselves as a thread so we can use locks. */ thread_init (); + + /* Initialize the console so we can use printf(). */ vga_init (); serial_init_poll (); console_init (); /* Greet user. */ - printf ("Pintos booting with %'zd kB RAM...\n", ram_pages * (PGSIZE / 1024)); + printf ("Pintos booting with %'zu kB RAM...\n", ram_pages * PGSIZE / 1024); /* Parse command line. */ argv_init (); - /* Initialize memory system, segments, paging. */ + /* Initialize memory system. */ palloc_init (); + malloc_init (); paging_init (); + + /* Segmentation. */ #ifdef USERPROG tss_init (); gdt_init (); #endif - malloc_init (); /* Set random seed if argv_init() didn't. */ random_init (0); @@ -98,6 +105,7 @@ main (void) /* Start thread scheduler and enable interrupts. */ thread_start (); serial_init_queue (); + timer_calibrate (); #ifdef FILESYS /* Initialize filesystem. */ @@ -113,17 +121,18 @@ main (void) if (initial_program != NULL) { printf ("\nExecuting '%s':\n", initial_program); - thread_execute (initial_program); + process_wait (process_execute (initial_program)); } #else + /* Run the compiled-in test function. */ test (); #endif - if (power_off) - do_power_off (); - - /* Terminate this thread. */ - thread_exit (); + /* Finish up. */ + if (power_off_when_done) + power_off (); + else + thread_exit (); } /* Clear BSS and obtain RAM size from loader. */ @@ -158,7 +167,7 @@ paging_init (void) uint32_t *pd, *pt; size_t page; - pd = base_page_dir = palloc_get (PAL_ASSERT | PAL_ZERO); + pd = base_page_dir = palloc_get_page (PAL_ASSERT | PAL_ZERO); pt = NULL; for (page = 0; page < ram_pages; page++) { @@ -169,14 +178,18 @@ paging_init (void) if (pd[pde_idx] == 0) { - pt = palloc_get (PAL_ASSERT | PAL_ZERO); + pt = palloc_get_page (PAL_ASSERT | PAL_ZERO); pd[pde_idx] = pde_create (pt); } pt[pte_idx] = pte_create_kernel (vaddr, true); } - asm volatile ("movl %0,%%cr3" :: "r" (vtop (base_page_dir))); + /* Store the physical address of the page directory into CR3 + aka PDBR (page directory base register). This activates our + new page tables immediately. See [IA32-v2a] "MOV--Move + to/from Control Registers" and [IA32-v3] 3.7.5. */ + asm volatile ("mov %%cr3, %0" :: "r" (vtop (base_page_dir))); } /* Parses the command line. */ @@ -209,16 +222,16 @@ argv_init (void) for (i = 0; i < argc; i++) if (!strcmp (argv[i], "-rs")) random_init (atoi (argv[++i])); - else if (!strcmp (argv[i], "-d")) - debug_enable (argv[++i]); else if (!strcmp (argv[i], "-q")) - power_off = true; + power_off_when_done = true; #ifdef USERPROG else if (!strcmp (argv[i], "-ex")) initial_program = argv[++i]; + else if (!strcmp (argv[i], "-ul")) + user_page_limit = atoi (argv[++i]); #endif #ifdef FILESYS - else if (!strcmp (argv[i], "-f")) + else if (!strcmp (argv[i], "-f")) format_filesys = true; else if (!strcmp (argv[i], "-ci")) { @@ -233,33 +246,30 @@ argv_init (void) fsutil_remove_file = argv[++i]; else if (!strcmp (argv[i], "-ls")) fsutil_list_files = true; - else if (!strcmp (argv[i], "-D")) - fsutil_dump_filesys = true; #endif else if (!strcmp (argv[i], "-u")) { printf ( "Kernel options:\n" - " -rs SEED Seed random seed to SEED.\n" - " -d CLASS[,...] Enable the given classes of debug messages.\n" + " -rs SEED Set random seed to SEED.\n" #ifdef USERPROG " -ex 'PROG [ARG...]' Run PROG, passing the optional arguments.\n" + " -ul USER_MAX Limit user memory to USER_MAX pages.\n" #endif #ifdef FILESYS " -f Format the filesystem disk (hdb or hd0:1).\n" " -ci FILENAME SIZE Copy SIZE bytes from the scratch disk (hdc\n" - " or hd1:0) into the filesystem as FILENAME\n" + " or hd1:0) into the filesystem as FILENAME.\n" " -co FILENAME Copy FILENAME to the scratch disk, with\n" - " size at start of sector 0 and data afterward\n" - " -p FILENAME Print the contents of FILENAME\n" - " -r FILENAME Delete FILENAME\n" - " -ls List the files in the filesystem\n" - " -D Dump complete filesystem contents\n" + " size at start of sector 0 and data after.\n" + " -p FILENAME Print the contents of FILENAME.\n" + " -r FILENAME Delete FILENAME.\n" + " -ls List files in the root directory.\n" #endif " -q Power off after doing requested actions.\n" " -u Print this help message and power off.\n" ); - do_power_off (); + power_off (); } else PANIC ("unknown option `%s' (use -u for help)", argv[i]); @@ -268,7 +278,7 @@ argv_init (void) /* Powers down the machine we're running on, as long as we're running on Bochs or qemu. */ void -do_power_off (void) +power_off (void) { const char s[] = "Shutdown"; const char *p; @@ -277,8 +287,28 @@ do_power_off (void) filesys_done (); #endif + print_stats (); + printf ("Powering off...\n"); + serial_flush (); + for (p = s; *p != '\0'; p++) outb (0x8900, *p); 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 +}