bug in race detector

[model-checker.git] / main.cc

diff --git a/main.cc b/main.cc
index 9af745d4280d865dab0c350a306e3594640a4968..75efafed43870f8be079fc8fcb1cb49bd8412706 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -1,77 +1,60 @@
-#include <stdlib.h>
+/** @file main.cc
+ *  @brief Entry point for the model checker.
+ */
 
 #include "libthreads.h"
-#include "schedule.h"
 #include "common.h"
 #include "threads.h"
 
+#include "datarace.h"
+
 /* global "model" object */
 #include "model.h"
+#include "snapshot-interface.h"
 
-/*
- * Return 1 if found next thread, 0 otherwise
- */
-int num;
-int num1;
-int num2;
-
-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 parse_options(struct model_params *params, int argc, char **argv) {
 }
 
-static void thread_wait_finish(void)
-{
-
-       DBG();
-
-       while (!thread_system_next());
-}
+int main_argc;
+char **main_argv;
 
-/*
- * Main system function
- */
-int main()
-{
+/** The real_main function contains the main model checking loop. */
+static void real_main() {
        thrd_t user_thread;
-       ucontext_t main_context;
+       struct model_params params;
+
+       parse_options(&params, main_argc, main_argv);
 
-       model = new ModelChecker();
+       //Initialize race detector
+       initRaceDetector();
 
-       if (getcontext(&main_context))
-               return 1;
+       //Create the singleton SnapshotStack object
+       snapshotObject = new SnapshotStack();
 
-       model->set_system_context(&main_context);
+       model = new ModelChecker(params);
 
+       snapshotObject->snapshotStep(0);
        do {
                /* Start user program */
-               model->add_thread(new Thread(&user_thread, &user_main, NULL));
+               model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
 
                /* Wait for all threads to complete */
-               thread_wait_finish();
+               model->finish_execution();
        } while (model->next_execution());
 
        delete model;
 
        DEBUG("Exiting\n");
-       return 0;
+}
+
+/**
+ * Main function.  Just initializes snapshotting library and the
+ * snapshotting library calls the real_main function.
+ */
+int main(int argc, char ** argv) {
+       main_argc = argc;
+       main_argv = argv;
+
+       /* Let's jump in quickly and start running stuff */
+       initSnapShotLibrary(10000, 1024, 1024, 1000, &real_main);
 }