Make tests public. Rewrite most tests. Add tests.

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

diff --git a/src/threads/thread.h b/src/threads/thread.h
index 6fcbfc75fe49647a359b4eb56e927375ca694164..2043d8dc86e251bbd8c0492aaabc8266e935c3b9 100644 (file)
--- a/src/threads/thread.h
+++ b/src/threads/thread.h
@@ -20,9 +20,9 @@ typedef int tid_t;
 #define TID_ERROR ((tid_t) -1)          /* Error value for tid_t. */
 
 /* Thread priorities. */
-#define PRI_MIN 0                       /* Lowest priority. */
-#define PRI_DEFAULT 29                  /* Default priority. */
-#define PRI_MAX 59                      /* Highest priority. */
+#define PRI_MIN 0                       /* Highest priority. */
+#define PRI_DEFAULT 31                  /* Default priority. */
+#define PRI_MAX 63                      /* Lowest priority. */
 
 /* A kernel thread or user process.
 
@@ -90,7 +90,7 @@ struct thread
     int priority;                       /* Priority. */
 
     /* Shared between thread.c and synch.c. */
-    list_elem elem;                     /* List element. */
+    struct list_elem elem;              /* List element. */
 
 #ifdef USERPROG
     /* Owned by userprog/process.c. */
@@ -103,6 +103,7 @@ struct thread
 
 void thread_init (void);
 void thread_start (void);
+
 void thread_tick (void);
 void thread_print_stats (void);
 
@@ -119,11 +120,12 @@ const char *thread_name (void);
 void thread_exit (void) NO_RETURN;
 void thread_yield (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);
+void thread_set_priority (int);
+
+int thread_get_nice (void);
+void thread_set_nice (int);
+int thread_get_recent_cpu (void);
+int thread_get_load_avg (void);
 
 #endif /* threads/thread.h */