X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Finit.c;h=51d6bdd43d7ee39ed3eb1b7dcf3b20881639ba48;hb=59385cfe7f0fc5a66dfc1da7c2e5b817edbcae65;hp=1025172727e1682bc0a350c9dc52630986fa621f;hpb=e49318880e6420e9b5a4ae9ffb986b49f89798e0;p=pintos-anon diff --git a/src/threads/init.c b/src/threads/init.c index 1025172..51d6bdd 100644 --- a/src/threads/init.c +++ b/src/threads/init.c @@ -21,7 +21,7 @@ #include "threads/test.h" #include "threads/thread.h" #ifdef USERPROG -#include "userprog/addrspace.h" +#include "userprog/process.h" #include "userprog/exception.h" #include "userprog/gdt.h" #include "userprog/syscall.h" @@ -39,49 +39,68 @@ size_t ram_pages; /* Page directory with kernel mappings only. */ uint32_t *base_page_dir; -#ifdef FILESYS -/* -f: Format the filesystem? */ -static bool format_filesys; -#endif +/* -o mlfqs: + If false (default), use round-robin scheduler. + If true, use multi-level feedback queue scheduler. */ +bool enable_mlfqs; #ifdef USERPROG /* -ex: Initial program to run. */ static char *initial_program; #endif -/* -q: Power off after running requested actions? */ -static bool do_power_off; +#ifdef VM +/* -o random-paging: + If false (default), use LRU page replacement policy. + If true, use random page replacement policy. */ +bool enable_random_paging; +#endif + +#ifdef FILESYS +/* -f: Format the filesystem? */ +static bool format_filesys; +#endif + +/* -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 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 +117,7 @@ main (void) /* Start thread scheduler and enable interrupts. */ thread_start (); serial_init_queue (); + timer_calibrate (); #ifdef FILESYS /* Initialize filesystem. */ @@ -113,17 +133,18 @@ main (void) if (initial_program != NULL) { printf ("\nExecuting '%s':\n", initial_program); - addrspace_execute (initial_program); + process_wait (process_execute (initial_program)); } #else + /* Run the compiled-in test function. */ test (); #endif - if (do_power_off) + /* Finish up. */ + if (power_off_when_done) power_off (); - - /* Terminate this thread. */ - thread_exit (); + else + thread_exit (); } /* Clear BSS and obtain RAM size from loader. */ @@ -158,7 +179,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 +190,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. */ @@ -207,18 +232,30 @@ argv_init (void) /* Parse the words. */ for (i = 0; i < argc; i++) - if (!strcmp (argv[i], "-rs")) + if (!strcmp (argv[i], "-o")) + { + i++; + if (!strcmp (argv[i], "mlfqs")) + enable_mlfqs = true; +#ifdef VM + else if (!strcmp (argv[i], "random-paging")) + enable_random_paging = true; +#endif + else + PANIC ("unknown option `-o %s' (use -u for help)", argv[i]); + } + else 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")) - do_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,29 +270,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" + " -o mlfqs Use multi-level feedback queue scheduler.\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 VM + " -o random-paging Use random page replacement policy.\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" - " -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" + " -ci FILE SIZE Copy SIZE bytes from the scratch disk (hdc\n" + " or hd1:0) into the filesystem as FILE.\n" + " -co FILE Copy FILE to the scratch disk, with\n" + " size at start of sector 0 and data after.\n" + " -p FILE Print the contents of FILE.\n" + " -r FILE Delete FILE.\n" + " -ls List files in the root directory.\n" #endif + " -rs SEED Set random seed to SEED.\n" " -q Power off after doing requested actions.\n" " -u Print this help message and power off.\n" ); @@ -277,8 +315,28 @@ 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 +}