main: split main() (and related functions) into main.cc

diff --git a/Makefile b/Makefile
index 4a5360d96058701c69383197a38131f409b416dd..3de1869ed9949198a2923e9976404bced388ce3e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ LIB_SO=lib$(LIB_NAME).so
 USER_O=userprog.o
 USER_H=libthreads.h libatomic.h
 
-MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc malloc.c threads.cc tree.cc librace.cc
-MODEL_O=libthreads.o schedule.o libatomic.o model.o malloc.o threads.o tree.o librace.o
+MODEL_CC=libthreads.cc schedule.cc libatomic.cc model.cc malloc.c threads.cc tree.cc librace.cc main.cc
+MODEL_O=libthreads.o schedule.o libatomic.o model.o malloc.o threads.o tree.o librace.o main.o
 MODEL_H=libthreads.h schedule.h common.h libatomic.h model.h threads.h tree.h librace.h action.h
 
 CPPFLAGS=-Wall -g

diff --git a/main.cc b/main.cc
new file mode 100644 (file)
index 0000000..c7c348f
--- /dev/null
+++ b/main.cc
@@ -0,0 +1,73 @@
+#include <stdlib.h>
+
+#include "libthreads.h"
+#include "schedule.h"
+#include "common.h"
+#include "threads.h"
+
+/* global "model" object */
+#include "model.h"
+
+/*
+ * Return 1 if found next thread, 0 otherwise
+ */
+static int thread_system_next(void)
+{
+       Thread *curr, *next;
+
+       curr = thread_current();
+       if (curr) {
+               if (curr->get_state() == THREAD_READY) {
+                       model->check_current_action();
+                       model->scheduler->add_thread(curr);
+               } else if (curr->get_state() == THREAD_RUNNING)
+                       /* Stopped while running; i.e., completed */
+                       curr->complete();
+               else
+                       ASSERT(false);
+       }
+       next = model->scheduler->next_thread();
+       if (next)
+               next->set_state(THREAD_RUNNING);
+       DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
+       if (!next)
+               return 1;
+       return Thread::swap(model->get_system_context(), next);
+}
+
+static void thread_wait_finish(void)
+{
+
+       DBG();
+
+       while (!thread_system_next());
+}
+
+/*
+ * Main system function
+ */
+int main()
+{
+       thrd_t user_thread;
+       ucontext_t main_context;
+
+       model = new ModelChecker();
+
+       if (getcontext(&main_context))
+               return 1;
+
+       model->set_system_context(&main_context);
+
+       do {
+               /* Start user program */
+               model->add_thread(new Thread(&user_thread, &user_main, NULL));
+
+               /* Wait for all threads to complete */
+               thread_wait_finish();
+       } while (model->next_execution());
+
+       delete model;
+
+       DEBUG("Exiting\n");
+       return 0;
+}

diff --git a/threads.cc b/threads.cc
index cc939318938170da4712191ab7ea7bd20e78140b..946b5e4f8a312d7a9d8b814d4be7f8785afc3a04 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -100,67 +100,3 @@ thread_id_t Thread::get_id()
 {
        return id;
 }
-
-/*
- * Return 1 if found next thread, 0 otherwise
- */
-static int thread_system_next(void)
-{
-       Thread *curr, *next;
-
-       curr = thread_current();
-       if (curr) {
-               if (curr->get_state() == THREAD_READY) {
-                       model->check_current_action();
-                       model->scheduler->add_thread(curr);
-               } else if (curr->get_state() == THREAD_RUNNING)
-                       /* Stopped while running; i.e., completed */
-                       curr->complete();
-               else
-                       ASSERT(false);
-       }
-       next = model->scheduler->next_thread();
-       if (next)
-               next->set_state(THREAD_RUNNING);
-       DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
-       if (!next)
-               return 1;
-       return Thread::swap(model->get_system_context(), next);
-}
-
-static void thread_wait_finish(void)
-{
-
-       DBG();
-
-       while (!thread_system_next());
-}
-
-/*
- * Main system function
- */
-int main()
-{
-       thrd_t user_thread;
-       ucontext_t main_context;
-
-       model = new ModelChecker();
-
-       if (getcontext(&main_context))
-               return 1;
-
-       model->set_system_context(&main_context);
-
-       do {
-               /* Start user program */
-               model->add_thread(new Thread(&user_thread, &user_main, NULL));
-
-               /* Wait for all threads to complete */
-               thread_wait_finish();
-       } while (model->next_execution());
-
-       delete model;
-
-       DEBUG("Exiting\n");
-       return 0;
-}