X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fthread.h;h=1dfde5ac9b03867f94a545f08cc2a7bb2ac83435;hb=5fbedf1d20c2b2f2dbc8c7ebd64cc7b4812a44bf;hp=a9b3251249d11f6415065866cda95032f9a67194;hpb=8ca3547f6c4d6d01a76d3ce642a0c1bf884c4c2a;p=pintos-anon

diff --git a/src/threads/thread.h b/src/threads/thread.h
index a9b3251..1dfde5a 100644
--- a/src/threads/thread.h
+++ b/src/threads/thread.h
@@ -2,6 +2,7 @@
 #define HEADER_THREAD_H 1
 
 #include <stdint.h>
+#include "debug.h"
 #include "list.h"
 
 #ifdef USERPROG
@@ -18,34 +19,36 @@ enum thread_status
 
 struct thread 
   {
-    enum thread_status status;
-    char name[16];
-    uint32_t *stack;
-    list_elem rq_elem;
+    /* These members are owned by the thread_*() functions. */
+    enum thread_status status;          /* Thread state. */
+    char name[16];                      /* Name (for debugging purposes). */
+    uint8_t *stack;                     /* Saved stack pointer. */
+    list_elem rq_elem;                  /* Run queue list element. */
+
 #ifdef USERPROG
-    struct addrspace addrspace;
+    /* These members are owned by the addrspace_*() functions. */
+    uint32_t *pagedir;                  /* Page directory. */
 #endif
+    
+    /* Marker to detect stack overflow. */
+    unsigned magic;                     /* Always set to THREAD_MAGIC. */
   };
 
 void thread_init (void);
+void thread_start (void) NO_RETURN;
 
-struct thread *thread_create (const char *name,
-                              void (*function) (void *aux), void *aux);
-void thread_destroy (struct thread *);
-struct thread *thread_current (void);
-
+typedef void thread_func (void *aux);
+struct thread *thread_create (const char *name, thread_func *, void *);
 #ifdef USERPROG
-void thread_execute (const char *filename);
+bool thread_execute (const char *filename);
 #endif
 
-void thread_start (struct thread *);
-void thread_ready (struct thread *);
-void thread_exit (void);
+void thread_wake (struct thread *);
+const char *thread_name (struct thread *);
 
+struct thread *thread_current (void);
+void thread_exit (void) NO_RETURN;
 void thread_yield (void);
 void thread_sleep (void);
-void thread_schedule (void);
-
-void thread_self_test (void);
 
 #endif /* thread.h */