Clean up threads.c.

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

diff --git a/src/threads/thread.h b/src/threads/thread.h
index b72c372b7ac98407e353480af5a7e1808dd32c23..4d65e1bdf68980b8d7cfcbd9150162eacf466084 100644 (file)
--- a/src/threads/thread.h
+++ b/src/threads/thread.h
@@ -2,8 +2,13 @@
 #define HEADER_THREAD_H 1
 
 #include <stdint.h>
+#include "debug.h"
 #include "list.h"
 
+#ifdef USERPROG
+#include "addrspace.h"
+#endif
+
 enum thread_status 
   {
     THREAD_RUNNING,
@@ -16,23 +21,26 @@ struct thread
   {
     enum thread_status status;
     char name[16];
-    uint32_t *stack;
-    struct list_elem rq_elem;
+    uint8_t *stack;
+    list_elem rq_elem;
+#ifdef USERPROG
+    struct addrspace addrspace;
+#endif
   };
 
-void thread_init (void);
-
-struct thread *thread_create (const char *name,
-                              void (*function) (void *aux), void *aux);
+void thread_init (const char *name, void (*) (void *aux), void *) NO_RETURN;
+struct thread *thread_create (const char *name, void (*) (void *aux), void *);
 void thread_destroy (struct thread *);
 struct thread *thread_current (void);
 
-void thread_start (struct thread *);
+#ifdef USERPROG
+bool thread_execute (const char *filename);
+#endif
+
 void thread_ready (struct thread *);
-void thread_exit (void);
+void thread_exit (void) NO_RETURN;
 
 void thread_yield (void);
 void thread_sleep (void);
-void thread_schedule (void);
 
 #endif /* thread.h */