X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=doc%2Fuserprog.texi;h=d401fda025f1f98b81ed78a31c743ccbd30bf68e;hb=71a7177a212dbecb048aaa8db4ff54620ff25464;hp=7322dd52946c2c9b601063bc717dbd2f38d245cf;hpb=68bad31062d1a3196a9e4d8550d561c22ae5e9cb;p=pintos-anon

diff --git a/doc/userprog.texi b/doc/userprog.texi
index 7322dd5..d401fda 100644
--- a/doc/userprog.texi
+++ b/doc/userprog.texi
@@ -481,6 +481,12 @@ The @code{write} system call for writing to fd 1, the system console.
 All of our test programs write to the console (the user process version
 of @func{printf} is implemented this way), so they will all malfunction
 until @code{write} is available.
+
+@item
+For now, change @func{process_wait} to an infinite loop (one that waits
+forever).  The provided implementation returns immediately, so Pintos
+will power off before any processes actually get to run.  You will
+eventually need to provide a correct implementation.
 @end itemize
 
 After the above are implemented, user processes should work minimally.
@@ -593,8 +599,8 @@ the program cannot load or run for any reason.
 @deftypefn {System Call} int wait (pid_t @var{pid})
 Waits for process @var{pid} to die and returns the status it passed to
 @code{exit}.  Returns -1 if @var{pid}
-was terminated by the kernel (i.e.@: killed due to an exception).  If
-@var{pid} is invalid or if it was not a child of the
+was terminated by the kernel (e.g.@: killed due to an exception).  If
+@var{pid} is does not refer to a child of the
 calling thread, or if @code{wait} has already been successfully
 called for the given @var{pid}, returns -1 immediately, without
 waiting.
@@ -659,7 +665,8 @@ Reads @var{size} bytes from the file open as @var{fd} into
 @var{buffer}.  Returns the number of bytes actually read (0 at end of
 file), or -1 if the file could not be read (due to a condition other
 than end of file).  Fd 0 reads from the keyboard using
-@func{kbd_getc}.
+@func{kbd_getc}.  (Keyboard input will not work if you pass the
+@option{-v} option to @command{pintos}.)
 
 Consider implementing this function in terms of @func{file_read}.
 @end deftypefn