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
/
filesys
/
fslib.c
diff --git
a/grading/filesys/fslib.c
b/grading/filesys/fslib.c
index be17f298d73a89587eee0a00c212ca084f89f166..2087d074b379949a18ff3a60030c7fe018875e34 100644
(file)
--- a/
grading/filesys/fslib.c
+++ b/
grading/filesys/fslib.c
@@
-188,15
+188,15
@@
exec_children (const char *child_name, pid_t pids[], size_t child_cnt)
}
void
}
void
-
join
_children (pid_t pids[], size_t child_cnt)
+
wait
_children (pid_t pids[], size_t child_cnt)
{
size_t i;
for (i = 0; i < child_cnt; i++)
{
{
size_t i;
for (i = 0; i < child_cnt; i++)
{
- int status =
join
(pids[i]);
+ int status =
wait
(pids[i]);
CHECK (status == (int) i,
CHECK (status == (int) i,
- "
join
child %zu of %zu returned %d (expected %zu)",
+ "
wait for
child %zu of %zu returned %d (expected %zu)",
i + 1, child_cnt, status, i);
}
}
i + 1, child_cnt, status, i);
}
}