-#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 "debug.h"
-#include "list.h"
#ifdef USERPROG
-#include "addrspace.h"
+#include "userprog/addrspace.h"
#endif
/* States in a thread's life cycle. */
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. */
+
+/* Thread priorities. */
+#define PRI_MIN 0 /* Lowest priority. */
+#define PRI_DEFAULT 29 /* Default priority. */
+#define PRI_MAX 59 /* Highest priority. */
+
/* A kernel thread or user process.
Each thread structure is stored in its own 4 kB page. The
the `magic' member of the running thread's `struct thread' is
set to THREAD_MAGIC. Stack overflow will normally change this
value, triggering the assertion. */
+/* The `elem' member has a dual purpose. It can be an element in
+ the run queue (thread.c), or it can be an element in a
+ semaphore wait list (synch.c). It can be used these two ways
+ only because they are mutually exclusive: only a thread in the
+ ready state is on the run queue, whereas only a thread in the
+ blocked state is on a semaphore wait list. */
struct thread
{
- /* These members are owned by the thread_*() functions. */
+ /* 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. */
- list_elem rq_elem; /* Run queue list element. */
+ int priority; /* Priority. */
+
+ /* Shared between thread.c and synch.c. */
+ list_elem elem; /* List element. */
#ifdef USERPROG
- /* These members are owned by the addrspace_*() functions. */
+ /* Owned by userprog/addrspace.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);
typedef void thread_func (void *aux);
-struct thread *thread_create (const char *name, thread_func *, void *);
+tid_t thread_create (const char *name, int priority, 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 */
+/* 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);
+
+#endif /* threads/thread.h */