#include <list.h>
#include <stdint.h>
-#ifdef USERPROG
-#include "userprog/addrspace.h"
-#endif
-
/* States in a thread's life cycle. */
enum thread_status
{
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). */
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);
typedef void thread_func (void *aux);
tid_t thread_create (const char *name, int priority, thread_func *, void *);
-#ifdef USERPROG
-tid_t thread_execute (const char *filename);
-#endif
void thread_unblock (struct thread *);