projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update docs.
[pintos-anon]
/
src
/
threads
/
init.c
diff --git
a/src/threads/init.c
b/src/threads/init.c
index dbfd56be94be1af05439bbdaed05784a27581214..1afa8653dc6c828f8ab79ad3c500ce69eaee5cc0 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,22
+40,21
@@
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);
int main (void) NO_RETURN;
int main (void) NO_RETURN;
@@
-112,15
+112,20
@@
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
test ();
#endif
}
#else
test ();
#endif
- if (power_off)
-
do_
power_off ();
+ if (
do_
power_off)
+ power_off ();
/* Terminate this thread. */
thread_exit ();
/* Terminate this thread. */
thread_exit ();
@@
-158,7
+163,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
+174,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,7
+217,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"))
- 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];
@@
-259,7
+264,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
+273,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;
@@
-278,6
+283,8
@@
do_power_off (void)
#endif
printf ("Powering off...\n");
#endif
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 (;;);