projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get rid of file system "dump" operations because they weren't useful
[pintos-anon]
/
src
/
threads
/
init.c
diff --git
a/src/threads/init.c
b/src/threads/init.c
index c17316aa59efec1951ad48eed5c8e4522a3e0381..4b7835800487b14c27d61a9b7cc5e2a2be7ca903 100644
(file)
--- a/
src/threads/init.c
+++ b/
src/threads/init.c
@@
-120,13
+120,8
@@
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);
- 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. */
}
#else
/* Run the compiled-in test function. */
@@
-227,8
+222,6
@@
argv_init (void)
for (i = 0; i < argc; i++)
if (!strcmp (argv[i], "-rs"))
random_init (atoi (argv[++i]));
for (i = 0; i < argc; i++)
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
else if (!strcmp (argv[i], "-q"))
power_off_when_done = true;
#ifdef USERPROG
@@
-253,15
+246,12
@@
argv_init (void)
fsutil_remove_file = argv[++i];
else if (!strcmp (argv[i], "-ls"))
fsutil_list_files = true;
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"
#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"
+ " -rs SEED Set random seed to SEED.\n"
#ifdef USERPROG
" -ex 'PROG [ARG...]' Run PROG, passing the optional arguments.\n"
" -ul USER_MAX Limit user memory to USER_MAX pages.\n"
#ifdef USERPROG
" -ex 'PROG [ARG...]' Run PROG, passing the optional arguments.\n"
" -ul USER_MAX Limit user memory to USER_MAX pages.\n"
@@
-275,7
+265,6
@@
argv_init (void)
" -p FILENAME Print the contents of FILENAME\n"
" -r FILENAME Delete FILENAME\n"
" -ls List the files in the filesystem\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"
#endif
" -q Power off after doing requested actions.\n"
" -u Print this help message and power off.\n"
#endif
" -q Power off after doing requested actions.\n"
" -u Print this help message and power off.\n"