projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
%zd -> %zu
[pintos-anon]
/
src
/
threads
/
init.c
diff --git
a/src/threads/init.c
b/src/threads/init.c
index dbfd56be94be1af05439bbdaed05784a27581214..ef67071aec53daceb476b02faf3af4fe48fd7824 100644
(file)
--- 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 "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"
#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
uint32_t *base_page_dir;
#ifdef FILESYS
-/* Format the filesystem? */
+/*
-f:
Format the filesystem? */
static bool format_filesys;
#endif
#ifdef USERPROG
static bool format_filesys;
#endif
#ifdef USERPROG
-/* Initial program to run. */
+/*
-ex:
Initial program to run. */
static char *initial_program;
#endif
static char *initial_program;
#endif
-/* Power off after running requested actions? */
-static bool power_off;
+/*
-q:
Power off after running requested actions? */
+static bool
do_
power_off;
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
do_power_off
(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);
@@
-112,18
+119,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);
- thread_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 (power_off)
- do_power_off ();
-
- /* Terminate this thread. */
- thread_exit ();
+ /* Finish up. */
+ if (do_power_off)
+ power_off ();
+ else
+
thread_exit ();
}
\f
/* Clear BSS and obtain RAM size from loader. */
}
\f
/* Clear BSS and obtain RAM size from loader. */
@@
-158,7
+171,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
+182,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
+225,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"))
- power_off = true;
+
do_
power_off = 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
+259,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"
@@
-259,7
+275,7
@@
argv_init (void)
" -q Power off after doing requested actions.\n"
" -u Print this help message and power off.\n"
);
" -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]);
}
else
PANIC ("unknown option `%s' (use -u for help)", argv[i]);
@@
-268,7
+284,7
@@
argv_init (void)
/* Powers down the machine we're running on,
as long as we're running on Bochs or qemu. */
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;
{
const char s[] = "Shutdown";
const char *p;
@@
-277,8
+293,28
@@
do_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
+}