Invent tid_t data type and use it in many places where we current use

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

diff --git a/src/threads/thread.h b/src/threads/thread.h
index 27c1f041fa8f24f094cd666a3b50d8cd63840c0f..e844b5c2ec1a51033b668c89c1319f739b28c86b 100644 (file)
--- a/src/threads/thread.h
+++ b/src/threads/thread.h
@@ -1,9 +1,9 @@
-#ifndef HEADER_THREAD_H
-#define HEADER_THREAD_H 1
+#ifndef THREADS_THREAD_H
+#define THREADS_THREAD_H
 
+#include <debug.h>
+#include <list.h>
 #include <stdint.h>
-#include "lib/debug.h"
-#include "lib/list.h"
 
 #ifdef USERPROG
 #include "userprog/addrspace.h"
@@ -18,6 +18,11 @@ enum thread_status
     THREAD_DYING        /* About to be destroyed. */
   };
 
+/* Thread identifier type.
+   You can redefine this to whatever type you like. */
+typedef int tid_t;
+#define TID_ERROR ((tid_t) -1)          /* Error value for tid_t. */
+
 /* A kernel thread or user process.
 
    Each thread structure is stored in its own 4 kB page.  The
@@ -76,14 +81,17 @@ enum thread_status
    blocked state is on a semaphore wait list. */
 struct thread
   {
-    /* These members are owned by the thread_*() functions. */
+    /* These members are owned by thread.c. */
+    tid_t tid;                          /* Thread identifier. */
     enum thread_status status;          /* Thread state. */
     char name[16];                      /* Name (for debugging purposes). */
     uint8_t *stack;                     /* Saved stack pointer. */
+
+    /* Shared between thread.c and synch.c. */
     list_elem elem;                     /* List element. */
 
 #ifdef USERPROG
-    /* These members are owned by the addrspace_*() functions. */
+    /* These members are owned by userprog/addrspace.c. */
     uint32_t *pagedir;                  /* Page directory. */
 #endif
 
@@ -95,17 +103,23 @@ void thread_init (void);
 void thread_start (void);
 
 typedef void thread_func (void *aux);
-struct thread *thread_create (const char *name, thread_func *, void *);
+tid_t thread_create (const char *name, thread_func *, void *);
 #ifdef USERPROG
-bool thread_execute (const char *filename);
+tid_t thread_execute (const char *filename);
 #endif
 
 void thread_unblock (struct thread *);
-const char *thread_name (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);
 
-#endif /* thread.h */
+/* These functions will be implemented in project 1. */
+void thread_join (tid_t);
+void thread_set_priority (tid_t, int);
+int thread_get_priority (tid_t);
+
+#endif /* threads/thread.h */