X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fthread.h;h=0039560018ddc942fb2f10002ddd4d94e3045b8c;hb=53a7f5d0952a4595f252247f5ee3d017468eb57e;hp=55ac2324d14568ae53e17ae6b00332d829babe77;hpb=4b82f041ebf3300af81fc19cb62fd8915e26aa94;p=pintos-anon

diff --git a/src/threads/thread.h b/src/threads/thread.h
index 55ac232..0039560 100644
--- a/src/threads/thread.h
+++ b/src/threads/thread.h
@@ -21,8 +21,8 @@ typedef int tid_t;
 
 /* Thread priorities. */
 #define PRI_MIN 0                       /* Lowest priority. */
-#define PRI_DEFAULT 29                  /* Default priority. */
-#define PRI_MAX 59                      /* Highest priority. */
+#define PRI_DEFAULT 31                  /* Default priority. */
+#define PRI_MAX 63                      /* Highest 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. */
@@ -101,14 +101,21 @@ struct thread
     unsigned magic;                     /* Detects stack overflow. */
   };
 
+/* If false (default), use round-robin scheduler.
+   If true, use multi-level feedback queue scheduler.
+   Controlled by kernel command-line option "-o mlfqs". */
+extern bool thread_mlfqs;
+
 void thread_init (void);
 void thread_start (void);
+
 void thread_tick (void);
 void thread_print_stats (void);
 
 typedef void thread_func (void *aux);
 tid_t thread_create (const char *name, int priority, thread_func *, void *);
 
+void thread_block (void);
 void thread_unblock (struct thread *);
 
 struct thread *thread_current (void);
@@ -117,13 +124,13 @@ const char *thread_name (void);
 
 void thread_exit (void) NO_RETURN;
 void thread_yield (void);
-void thread_block (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 */