#include <list.h>
#include <stdint.h>
-#ifdef USERPROG
-#include "userprog/addrspace.h"
-#endif
-
/* States in a thread's life cycle. */
enum thread_status
{
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 31 /* Default priority. */
+#define PRI_MAX 63 /* Highest priority. */
+
/* A kernel thread or user process.
Each thread structure is stored in its own 4 kB page. The
| |
| |
+---------------------------------+
- | magic |
- | : |
- | : |
- | name |
- | status |
+ | magic |
+ | : |
+ | : |
+ | name |
+ | status |
0 kB +---------------------------------+
The upshot of this is twofold:
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
blocked state is on a semaphore wait list. */
struct thread
{
- /* These members are owned by thread.c. */
+ /* 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. */
+ int priority; /* Priority. */
/* Shared between thread.c and synch.c. */
- list_elem elem; /* List element. */
+ struct list_elem elem; /* List element. */
#ifdef USERPROG
- /* These members are owned by userprog/addrspace.c. */
+ /* Owned by userprog/process.c. */
uint32_t *pagedir; /* Page directory. */
#endif
- /* Marker to detect stack overflow. */
- unsigned magic; /* Always set to THREAD_MAGIC. */
+ /* Owned by thread.c. */
+ unsigned magic; /* Detects stack overflow. */
};
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, thread_func *, void *);
-#ifdef USERPROG
-tid_t thread_execute (const char *filename);
-#endif
+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);
-/* 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);
+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 */