Revise "Design" description.

[pintos-anon] / doc / tour.texi

diff --git a/doc/tour.texi b/doc/tour.texi
index efa1166abd072dd814c565fe362883675263c240..195238597b03a84805ecba4c979cf50846c69bd0 100644 (file)
--- a/doc/tour.texi
+++ b/doc/tour.texi
@@ -468,13 +468,13 @@ Before any of these functions call @func{schedule}, they disable
 interrupts (or ensure that they are already disabled) and then change
 the running thread's state to something other than running.
 
 interrupts (or ensure that they are already disabled) and then change
 the running thread's state to something other than running.
 

-The actual @func{schedule} implementation is simple.  It records the
+@func{schedule} is simple but tricky.  It records the

 current thread in local variable @var{cur}, determines the next thread
 to run as local variable @var{next} (by calling
 @func{next_thread_to_run}), and then calls @func{switch_threads} to do
 the actual thread switch.  The thread we switched to was also running
 inside @func{switch_threads}, as are all the threads not currently
 current thread in local variable @var{cur}, determines the next thread
 to run as local variable @var{next} (by calling
 @func{next_thread_to_run}), and then calls @func{switch_threads} to do
 the actual thread switch.  The thread we switched to was also running
 inside @func{switch_threads}, as are all the threads not currently

-running in Pintos, so the new thread now returns out of
+running, so the new thread now returns out of

 @func{switch_threads}, returning the previously running thread.
 
 @func{switch_threads} is an assembly language routine in
 @func{switch_threads}, returning the previously running thread.
 
 @func{switch_threads} is an assembly language routine in


@@ -742,7 +742,7 @@ condition after the wait completes and, if necessary, wait again.
 Initializes @var{cond} as a new condition variable.
 @end deftypefun
 
 Initializes @var{cond} as a new condition variable.
 @end deftypefun
 

-@deftypefun void cond_wait (struct condition *@var{cond})
+@deftypefun void cond_wait (struct condition *@var{cond}, struct lock *@var{lock})

 Atomically releases @var{lock} (the monitor lock) and waits for
 @var{cond} to be signaled by some other piece of code.  After
 @var{cond} is signaled, reacquires @var{lock} before returning.
 Atomically releases @var{lock} (the monitor lock) and waits for
 @var{cond} to be signaled by some other piece of code.  After
 @var{cond} is signaled, reacquires @var{lock} before returning.