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 0e8e2b9f7508a1ba9b591b70d2a5f80798fa3aef..1135ae7ccecc79ad1593671c7e3bbd906c31caa1 100644
(file)
--- a/
src/threads/init.c
+++ b/
src/threads/init.c
@@
-49,8
+49,8
@@
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 ram_init (void);
static void paging_init (void);
@@
-62,27
+62,33
@@
int main (void) NO_RETURN;
int
main (void)
{
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);
@@
-99,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. */
@@
-122,14
+129,15
@@
main (void)
#endif
}
#else
#endif
}
#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. */
@@
-218,7
+226,7
@@
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];