Permalink
Browse files

commit

  • Loading branch information...
2 parents 8b2fc7d + 8a02d83 commit 8d97b2c3ccaea1d8595a2941ed63a8cb41553c40 @Frankencelery Frankencelery committed Oct 28, 2012
Showing with 9 additions and 0 deletions.
  1. +9 −0 src/userprog/process.c
View
9 src/userprog/process.c
@@ -147,7 +147,16 @@ process_wait (tid_t child_tid)
if (t2->tid == child_tid){t = t2; break;}
}
if (t == NULL){return -1;}
+
sema_down(&(t->dead));
+<<<<<<< HEAD
+=======
+ list_remove(e);
+ //sema_up(&(t->dead));
+
+ //int temp = t->exit_code;
+ //t->exit_code = -1;
+>>>>>>> 8a02d8392796aa4bae7b9e5f21034f6b66aaecca
return t->exit_code;
}

0 comments on commit 8d97b2c

Please sign in to comment.