projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix lost thought.
[pintos-anon]
/
solutions
/
p3.patch
diff --git
a/solutions/p3.patch
b/solutions/p3.patch
index 0ac49841dc1081b04fa98a2af3ffb977b456282d..c7c9df84710d74f727dcf2d5807344fc2f0ed218 100644
(file)
--- a/
solutions/p3.patch
+++ b/
solutions/p3.patch
@@
-289,9
+289,9
@@
diff -u src/threads/thread.h~ src/threads/thread.h
+ struct semaphore dead; /* 1=child alive, 0=child dead. */
+ };
+
+ struct semaphore dead; /* 1=child alive, 0=child dead. */
+ };
+
- void thread_init (void);
- void thread_start (void);
-
+ /* If false (default), use round-robin scheduler.
+ If true, use multi-level feedback queue scheduler.
+ Controlled by kernel command-line options "-o mlfqs".
Index: src/userprog/exception.c
diff -u src/userprog/exception.c~ src/userprog/exception.c
--- src/userprog/exception.c~
Index: src/userprog/exception.c
diff -u src/userprog/exception.c~ src/userprog/exception.c
--- src/userprog/exception.c~
@@
-817,7
+817,7
@@
diff -u src/userprog/syscall.c~ src/userprog/syscall.c
#include <syscall-nr.h>
+#include "userprog/process.h"
+#include "userprog/pagedir.h"
#include <syscall-nr.h>
+#include "userprog/process.h"
+#include "userprog/pagedir.h"
-+#include "devices/
kbd
.h"
++#include "devices/
input
.h"
+#include "filesys/directory.h"
+#include "filesys/filesys.h"
+#include "filesys/file.h"
+#include "filesys/directory.h"
+#include "filesys/filesys.h"
+#include "filesys/file.h"
@@
-1159,7
+1159,7
@@
diff -u src/userprog/syscall.c~ src/userprog/syscall.c
+
+ for (i = 0; i < read_amt; i++)
+ {
+
+ for (i = 0; i < read_amt; i++)
+ {
-+ char c =
kbd
_getc ();
++ char c =
input
_getc ();
+ if (!page_lock (udst, true))
+ thread_exit ();
+ udst[i] = c;
+ if (!page_lock (udst, true))
+ thread_exit ();
+ udst[i] = c;