Merge new_thread() into thread_create().

[pintos-anon] / src / threads / thread.c

diff --git a/src/threads/thread.c b/src/threads/thread.c
index 80c01fda86ef8496f7b188494e307364ae8d1085..336be0392804907a9c560d87c1256f500991a8bc 100644 (file)
--- a/src/threads/thread.c
+++ b/src/threads/thread.c
@@ -2,6 +2,7 @@
 #include <debug.h>
 #include <stddef.h>
 #include <random.h>
+#include <stdio.h>
 #include <string.h>
 #include "threads/flags.h"
 #include "threads/interrupt.h"
@@ -11,6 +12,7 @@
 #include "threads/switch.h"
 #include "threads/synch.h"
 #ifdef USERPROG
+#include "userprog/process.h"
 #include "userprog/gdt.h"
 #endif
 
@@ -45,7 +47,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);
@@ -114,10 +115,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);
@@ -139,56 +144,6 @@ thread_create (const char *name, int priority,
   return tid;
 }
 
-#ifdef USERPROG
-/* Starts a new thread running a user program loaded from
-   FILENAME, and adds it to the ready queue.  If thread_start()
-   has been called, then new thread may be scheduled before
-   thread_execute() returns.*/
-tid_t
-thread_execute (const char *filename) 
-{
-  struct thread *t;
-  struct intr_frame *if_;
-  struct switch_entry_frame *ef;
-  struct switch_threads_frame *sf;
-  void (*start) (void);
-  tid_t tid;
-
-  ASSERT (filename != NULL);
-
-  t = new_thread (filename, PRI_DEFAULT);
-  if (t == NULL)
-    return TID_ERROR;
-  tid = t->tid;
-  
-  if (!addrspace_load (t, filename, &start)) 
-    PANIC ("%s: program load failed", filename);
-
-  /* Interrupt frame. */
-  if_ = alloc_frame (t, sizeof *if_);
-  if_->es = SEL_UDSEG;
-  if_->ds = SEL_UDSEG;
-  if_->eip = start;
-  if_->cs = SEL_UCSEG;
-  if_->eflags = FLAG_IF | FLAG_MBS;
-  if_->esp = PHYS_BASE;
-  if_->ss = SEL_UDSEG;
-
-  /* Stack frame for switch_entry(). */
-  ef = alloc_frame (t, sizeof *ef);
-  ef->eip = intr_exit;
-
-  /* Stack frame for switch_threads(). */
-  sf = alloc_frame (t, sizeof *sf);
-  sf->eip = switch_entry;
-
-  /* Add to run queue. */
-  thread_unblock (t);
-
-  return tid;
-}
-#endif
-
 /* Transitions a blocked thread T from its current state to the
    ready-to-run state.  This is an error if T is not blocked.
    (Use thread_yield() to make the running thread ready.) */
@@ -337,22 +292,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
@@ -397,17 +336,15 @@ next_thread_to_run (void)
     return list_entry (list_pop_front (&ready_list), struct thread, elem);
 }
 
-/* Destroys T, which must be in the dying state and must not be
-   the running thread. */
+/* Destroys T, which must not be the running thread. */
 static void
 destroy_thread (struct thread *t) 
 {
   ASSERT (is_thread (t));
-  ASSERT (t->status == THREAD_DYING);
   ASSERT (t != thread_current ());
 
 #ifdef USERPROG
-  addrspace_destroy (t);
+  process_destroy (t);
 #endif
   if (t != initial_thread)
     palloc_free (t);
@@ -437,7 +374,7 @@ schedule_tail (struct thread *prev)
 
 #ifdef USERPROG
   /* Activate the new address space. */
-  addrspace_activate (cur);
+  process_activate ();
 #endif
 
   /* If the thread we switched from is dying, destroy it.