Clean up threads.

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

diff --git a/src/threads/thread.h b/src/threads/thread.h
index a9b3251249d11f6415065866cda95032f9a67194..a5308aac3682802064f4910c945b2551cddece7a 100644 (file)
--- 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
@@ -10,6 +11,7 @@
 
 enum thread_status 
   {
+    THREAD_INITIALIZING,
     THREAD_RUNNING,
     THREAD_READY,
     THREAD_BLOCKED,
@@ -20,7 +22,7 @@ struct thread
   {
     enum thread_status status;
     char name[16];
-    uint32_t *stack;
+    uint8_t *stack;
     list_elem rq_elem;
 #ifdef USERPROG
     struct addrspace addrspace;
@@ -28,24 +30,19 @@ struct thread
   };
 
 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);
-
+struct thread *thread_create (const char *name, void (*) (void *aux), void *);
 #ifdef USERPROG
-void thread_execute (const char *filename);
+bool thread_execute (const char *filename);
 #endif
 
-void thread_start (struct thread *);
+void thread_destroy (struct thread *);
 void thread_ready (struct thread *);
-void thread_exit (void);
 
+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 */