Get rid of THREAD_JOIN_IMPLEMENTED by adding thread_join() stub.

[pintos-anon] / src / threads / thread.h

diff --git a/src/threads/thread.h b/src/threads/thread.h
index 9b55700315ec4b293530a00b5b367d761f5c1768..af1f16d662e48b7da501a9999b3cc1d0de689e78 100644 (file)
--- a/src/threads/thread.h
+++ b/src/threads/thread.h
@@ -47,11 +47,11 @@ typedef int tid_t;
              |                                 |
              |                                 |
              +---------------------------------+
-             |             magic               |
-             |               :                 |
-             |               :                 |
-             |              name               |
-             |             status              |
+             |              magic              |
+             |                :                |
+             |                :                |
+             |               name              |
+             |              status             |
         0 kB +---------------------------------+
 
    The upshot of this is twofold:
@@ -66,7 +66,7 @@ typedef int tid_t;
          large.  If a stack overflows, it will corrupt the thread
          state.  Thus, kernel functions should not allocate large
          structures or arrays as non-static local variables.  Use
-         dynamic allocation with malloc() or palloc_get()
+         dynamic allocation with malloc() or palloc_get_page()
          instead.
 
    The first symptom of either of these problems will probably be
@@ -97,29 +97,30 @@ struct thread
     uint32_t *pagedir;                  /* Page directory. */
 #endif
 
-    /* Owned by thread.c */
+    /* Owned by thread.c. */
     unsigned magic;                     /* Detects stack overflow. */
   };
 
 void thread_init (void);
 void thread_start (void);
+void thread_tick (void);
+void thread_print_stats (void);
 
 typedef void thread_func (void *aux);
 tid_t thread_create (const char *name, int priority, thread_func *, void *);
 
+void thread_block (void);
 void thread_unblock (struct thread *);
 
 struct thread *thread_current (void);
 tid_t thread_tid (void);
 const char *thread_name (void);
+
 void thread_exit (void) NO_RETURN;
 void thread_yield (void);
-void thread_block (void);
 
-/* This function will be implemented in problem 1-2. */
 void thread_join (tid_t);
 
-/* These functions will be implemented in problem 1-3. */
 void thread_set_priority (int);
 int thread_get_priority (void);