projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Wording fixes.
[pintos-anon]
/
src
/
threads
/
init.c
diff --git
a/src/threads/init.c
b/src/threads/init.c
index 0d9c69984603eaaa6a69bf4fac58c4af9e54ce54..1135ae7ccecc79ad1593671c7e3bbd906c31caa1 100644
(file)
--- a/
src/threads/init.c
+++ b/
src/threads/init.c
@@
-49,39
+49,46
@@
static bool format_filesys;
static char *initial_program;
#endif
static char *initial_program;
#endif
-/* -q: Power off after
running requested actions
? */
-
static bool do_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 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)
{
int main (void) NO_RETURN;
int
main (void)
{
- /*
Initialize everything needed for printf() first. */
+ /*
Clear BSS and get machine's RAM size. */
ram_init ();
ram_init ();
+
+ /* Initialize ourselves as a thread so we can use locks. */
thread_init ();
thread_init ();
+
+ /* Initialize the console so we can use printf(). */
vga_init ();
serial_init_poll ();
console_init ();
/* Greet user. */
vga_init ();
serial_init_poll ();
console_init ();
/* Greet user. */
- printf ("Pintos booting with %'z
d kB RAM...\n", ram_pages * (PGSIZE / 1024)
);
+ printf ("Pintos booting with %'z
u kB RAM...\n", ram_pages * PGSIZE / 1024
);
/* Parse command line. */
argv_init ();
/* Parse command line. */
argv_init ();
- /* Initialize memory system
, segments, paging
. */
+ /* Initialize memory system. */
palloc_init ();
palloc_init ();
+ malloc_init ();
paging_init ();
paging_init ();
+
+ /* Segmentation. */
#ifdef USERPROG
tss_init ();
gdt_init ();
#endif
#ifdef USERPROG
tss_init ();
gdt_init ();
#endif
- malloc_init ();
/* Set random seed if argv_init() didn't. */
random_init (0);
/* 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 ();
/* Start thread scheduler and enable interrupts. */
thread_start ();
serial_init_queue ();
+ timer_calibrate ();
#ifdef FILESYS
/* Initialize filesystem. */
#ifdef FILESYS
/* Initialize filesystem. */
@@
-112,18
+120,24
@@
main (void)
/* Run a user program. */
if (initial_program != NULL)
{
/* Run a user program. */
if (initial_program != NULL)
{
+ tid_t tid;
printf ("\nExecuting '%s':\n", initial_program);
printf ("\nExecuting '%s':\n", initial_program);
- process_execute (initial_program);
+ tid = process_execute (initial_program);
+#ifdef THREAD_JOIN_IMPLEMENTED
+ if (tid != TID_ERROR)
+ thread_join (tid);
+#endif
}
#else
}
#else
+ /* Run the compiled-in test function. */
test ();
#endif
test ();
#endif
- if (do_power_off)
+ /* Finish up. */
+ if (power_off_when_done)
power_off ();
power_off ();
-
- /* Terminate this thread. */
- thread_exit ();
+ else
+ thread_exit ();
}
\f
/* Clear BSS and obtain RAM size from loader. */
}
\f
/* Clear BSS and obtain RAM size from loader. */
@@
-158,7
+172,7
@@
paging_init (void)
uint32_t *pd, *pt;
size_t page;
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++)
{
pt = NULL;
for (page = 0; page < ram_pages; page++)
{
@@
-169,7
+183,7
@@
paging_init (void)
if (pd[pde_idx] == 0)
{
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);
}
pd[pde_idx] = pde_create (pt);
}
@@
-212,13
+226,15
@@
argv_init (void)
else if (!strcmp (argv[i], "-d"))
debug_enable (argv[++i]);
else if (!strcmp (argv[i], "-q"))
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];
#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
#endif
#ifdef FILESYS
- else if (!strcmp (argv[i], "-f"))
+
else if (!strcmp (argv[i], "-f"))
format_filesys = true;
else if (!strcmp (argv[i], "-ci"))
{
format_filesys = true;
else if (!strcmp (argv[i], "-ci"))
{
@@
-244,6
+260,7
@@
argv_init (void)
" -d CLASS[,...] Enable the given classes of debug messages.\n"
#ifdef USERPROG
" -ex 'PROG [ARG...]' Run PROG, passing the optional arguments.\n"
" -d CLASS[,...] Enable the given classes of debug messages.\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"
#endif
#ifdef FILESYS
" -f Format the filesystem disk (hdb or hd0:1).\n"
@@
-277,8
+294,28
@@
power_off (void)
filesys_done ();
#endif
filesys_done ();
#endif
+ print_stats ();
+
printf ("Powering off...\n");
printf ("Powering off...\n");
+ serial_flush ();
+
for (p = s; *p != '\0'; p++)
outb (0x8900, *p);
for (;;);
}
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
+}