X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fthread.c;h=ae92e1d646dc50d50ce02d26747ca12a8bd82236;hb=d5aab5fcc001efba94a378535746e71a2e9d92f2;hp=01ce7d33227a19196762199f3c349bab4890b688;hpb=5b670fb86ef37f5a81188e940e5fe1b04b5824af;p=pintos-anon

diff --git a/src/threads/thread.c b/src/threads/thread.c
index 01ce7d3..ae92e1d 100644
--- a/src/threads/thread.c
+++ b/src/threads/thread.c
@@ -118,13 +118,15 @@ thread_print_stats (void)
 
 /* Creates a new kernel thread named NAME with the given initial
    PRIORITY, which executes FUNCTION passing AUX as the argument,
-   and adds it to the ready queue.  If thread_start() has been
-   called, then the new thread may be scheduled before
-   thread_create() returns.  It could even exit before
-   thread_create() returns.  Use a semaphore or some other form
-   of synchronization if you need to ensure ordering.  Returns
-   the thread identifier for the new thread, or TID_ERROR if
-   creation fails.
+   and adds it to the ready queue.  Returns the thread identifier
+   for the new thread, or TID_ERROR if creation fails.
+
+   If thread_start() has been called, then the new thread may be
+   scheduled before thread_create() returns.  It could even exit
+   before thread_create() returns.  Contrariwise, the original
+   thread may run for any amount of time before the new thread is
+   scheduled.  Use a semaphore or some other form of
+   synchronization if you need to ensure ordering.
 
    The code provided sets the new thread's `priority' member to
    PRIORITY, but no actual priority scheduling is implemented.
@@ -271,6 +273,31 @@ thread_yield (void)
   schedule ();
   intr_set_level (old_level);
 }
+
+/* Waits for the thread with the specified TID to terminate.  If
+   TID has already terminated or TID does not refer to an
+   immediate child of the current thread, returns immediately.
+
+   This function will be implemented in problem 1-2.  For now, it
+   does nothing. */
+void
+thread_join (tid_t child_tid UNUSED) 
+{
+}
+
+/* Sets the current thread's priority to NEW_PRIORITY. */
+void
+thread_set_priority (int new_priority) 
+{
+  thread_current ()->priority = new_priority;
+}
+
+/* Returns the current thread's priority. */
+int
+thread_get_priority (void) 
+{
+  return thread_current ()->priority;
+}
 
 /* Idle thread.  Executes when no other thread is ready to run. */
 static void