/* 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
+#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;
/* Run a user program. */
if (initial_program != NULL)
{
- tid_t tid;
printf ("\nExecuting '%s':\n", initial_program);
- tid = process_execute (initial_program);
-#ifdef THREAD_JOIN_IMPLEMENTED
- if (tid != TID_ERROR)
- thread_join (tid);
-#endif
+ process_wait (process_execute (initial_program));
}
#else
/* Run the compiled-in test function. */
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. */
/* 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"))
power_off_when_done = true;
#ifdef USERPROG
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"
);