X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fthread.h;h=7965c0607815eab3275da7babdf669177f18c8e2;hb=3edcfedb8e62970f3293fa676b6691f8658c3c11;hp=c0551273d80b5927ad0f41f76f94ca598a9de9b7;hpb=838c30d0075a3ee0413ba4909944b37f4970a10d;p=pintos-anon

diff --git a/src/threads/thread.h b/src/threads/thread.h
index c055127..7965c06 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.
 
@@ -47,11 +47,11 @@ typedef int tid_t;
              |                                 |
              |                                 |
              +---------------------------------+
-             |             magic               |
-             |               :                 |
-             |               :                 |
-             |              name               |
-             |             status              |
+             |              magic              |
+             |                :                |
+             |                :                |
+             |               name              |
+             |              status             |
         0 kB +---------------------------------+
 
    The upshot of this is twofold:
@@ -66,7 +66,7 @@ typedef int tid_t;
          large.  If a stack overflows, it will corrupt the thread
          state.  Thus, kernel functions should not allocate large
          structures or arrays as non-static local variables.  Use
-         dynamic allocation with malloc() or palloc_get()
+         dynamic allocation with malloc() or palloc_get_page()
          instead.
 
    The first symptom of either of these problems will probably be
@@ -88,41 +88,54 @@ struct thread
     char name[16];                      /* Name (for debugging purposes). */
     uint8_t *stack;                     /* Saved stack pointer. */
     int priority;                       /* Priority. */
+    struct list_elem allelem;           /* List element for all threads list. */
 
     /* 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. */
     uint32_t *pagedir;                  /* Page directory. */
 #endif
 
-    /* Owned by thread.c */
+    /* Owned by thread.c. */
     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);
 tid_t thread_tid (void);
 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);
+/* Performs some operation on thread t, given auxiliary data AUX. */
+typedef void thread_action_func (struct thread *t, void *aux);
+void thread_foreach (thread_action_func *, void *);
 
-/* 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 */