projects
/
pintos-anon
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move problem 1-2 (join) into project 2 as the "wait" system call.
[pintos-anon]
/
grading
/
vm
/
page-merge-seq.c
diff --git
a/grading/vm/page-merge-seq.c
b/grading/vm/page-merge-seq.c
index 57cd53c6f6531e8e5c33919af6ee0d1964853ceb..34d14f66cb49238cd03aaad21731fce9a66a727c 100644
(file)
--- a/
grading/vm/page-merge-seq.c
+++ b/
grading/vm/page-merge-seq.c
@@
-64,9
+64,9
@@
sort_chunks (void)
printf ("(page-merge-seq) exec() failed\n");
exit (1);
}
printf ("(page-merge-seq) exec() failed\n");
exit (1);
}
- if (
join
(child) != 123)
+ if (
wait
(child) != 123)
{
{
- printf ("(page-merge-seq)
join
(exec()) returned bad value\n");
+ printf ("(page-merge-seq)
wait
(exec()) returned bad value\n");
exit (1);
}
exit (1);
}