X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fthread.c;h=560423b7de39dd9f3c6d92efda1b4e23ce811b72;hb=e66a310a95cd4706fb130ab415275f48def03b8d;hp=fc358de69a4fe6a3cab2dff5dc594d43515d242c;hpb=b23bb24aef6326535f3b836f175a14914251ddd2;p=pintos-anon

diff --git a/src/threads/thread.c b/src/threads/thread.c
index fc358de..560423b 100644
--- a/src/threads/thread.c
+++ b/src/threads/thread.c
@@ -12,8 +12,7 @@
 #include "threads/switch.h"
 #include "threads/synch.h"
 #ifdef USERPROG
-#include "userprog/addrspace.h"
-#include "userprog/gdt.h"
+#include "userprog/process.h"
 #endif
 
 /* Random value for struct thread's `magic' member.
@@ -47,7 +46,6 @@ static void kernel_thread (thread_func *, void *aux);
 static void idle (void *aux UNUSED);
 static struct thread *running_thread (void);
 static struct thread *next_thread_to_run (void);
-static struct thread *new_thread (const char *name, int priority);
 static void init_thread (struct thread *, const char *name, int priority);
 static bool is_thread (struct thread *);
 static void *alloc_frame (struct thread *, size_t size);
@@ -71,15 +69,13 @@ thread_init (void)
   ASSERT (intr_get_level () == INTR_OFF);
 
   lock_init (&tid_lock, "tid");
+  list_init (&ready_list);
 
   /* Set up a thread structure for the running thread. */
   initial_thread = running_thread ();
   init_thread (initial_thread, "main", PRI_DEFAULT);
   initial_thread->status = THREAD_RUNNING;
   initial_thread->tid = allocate_tid ();
-
-  /* Initialize run queue. */
-  list_init (&ready_list);
 }
 
 /* Starts preemptive thread scheduling by enabling interrupts.
@@ -116,10 +112,14 @@ thread_create (const char *name, int priority,
 
   ASSERT (function != NULL);
 
-  t = new_thread (name, priority);
+  /* Allocate thread. */
+  t = palloc_get (PAL_ZERO);
   if (t == NULL)
     return TID_ERROR;
-  tid = t->tid;
+
+  /* Initialize thread. */
+  init_thread (t, name, priority);
+  tid = t->tid = allocate_tid ();
 
   /* Stack frame for kernel_thread(). */
   kf = alloc_frame (t, sizeof *kf);
@@ -289,22 +289,6 @@ is_thread (struct thread *t)
   return t != NULL && t->magic == THREAD_MAGIC;
 }
 
-/* Creates a new thread named NAME as a child of the running
-   thread.  Returns the new thread if successful or a null
-   pointer on failure. */
-static struct thread *
-new_thread (const char *name, int priority)
-{
-  struct thread *t = palloc_get (PAL_ZERO);
-  if (t != NULL) 
-    {
-      init_thread (t, name, priority);
-      t->tid = allocate_tid ();
-    }
-
-  return t;
-}
-
 /* Does basic initialization of T as a blocked thread named
    NAME. */
 static void
@@ -357,7 +341,7 @@ destroy_thread (struct thread *t)
   ASSERT (t != thread_current ());
 
 #ifdef USERPROG
-  addrspace_destroy (t);
+  process_destroy (t);
 #endif
   if (t != initial_thread)
     palloc_free (t);
@@ -387,7 +371,7 @@ schedule_tail (struct thread *prev)
 
 #ifdef USERPROG
   /* Activate the new address space. */
-  addrspace_activate ();
+  process_activate ();
 #endif
 
   /* If the thread we switched from is dying, destroy it.