projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make sure that we're not being tested with MLFQS on.
[pintos-anon]
/
solutions
/
p1-2.patch
diff --git
a/solutions/p1-2.patch
b/solutions/p1-2.patch
index a5e743f0e61aaf5cf45c907e56ccb3c86bae8218..b7e9c798f6674037242d2282e1c9e3cdd09404a5 100644
(file)
--- a/
solutions/p1-2.patch
+++ b/
solutions/p1-2.patch
@@
-76,7
+76,7
@@
diff -X pat -urpN pintos.orig/src/threads/thread.c pintos/src/threads/thread.c
/* Stack frame for kernel_thread(). */
kf = alloc_frame (t, sizeof *kf);
/* Stack frame for kernel_thread(). */
kf = alloc_frame (t, sizeof *kf);
-@@ -224,16 +226,3
4
@@ thread_tid (void)
+@@ -224,16 +226,3
3
@@ thread_tid (void)
void
thread_exit (void)
{
void
thread_exit (void)
{
@@
-97,7
+97,6
@@
diff -X pat -urpN pintos.orig/src/threads/thread.c pintos/src/threads/thread.c
+ e = list_next (e))
+ {
+ struct thread *child = list_entry (e, struct thread, children_elem);
+ e = list_next (e))
+ {
+ struct thread *child = list_entry (e, struct thread, children_elem);
-+ list_remove (e);
+ sema_up (&child->can_die);
+ }
+
+ sema_up (&child->can_die);
+ }
+