hashtable: some refactoring, signed-ness

[model-checker.git] / main.cc

diff --git a/main.cc b/main.cc
index b38f7ef4816d003f45d876133dacf0dc0d816bab..9a6c2d8fcadd5e9127a56082f48a682ce0d803c3 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -6,15 +6,17 @@
 #include "common.h"
 #include "threads.h"
 
+#include "datarace.h"
+
 /* global "model" object */
 #include "model.h"
 #include "snapshot-interface.h"
 
-/** The thread_system_next function takes the next step in the
- *  execution.  @return Returns the 1 if there is another step and 0
- *  otherwise.
+/**
+ * The thread_system_next function takes the next step in the execution, if
+ * possible.
+ * @return Returns 0 (success) if there is another step and non-zero otherwise.
  */
-
 static int thread_system_next(void) {
        Thread *curr, *next;
 
@@ -23,42 +25,60 @@ static int thread_system_next(void) {
                if (curr->get_state() == THREAD_READY) {
                        model->check_current_action();
                        model->scheduler->add_thread(curr);
-               } else if (curr->get_state() == THREAD_RUNNING)
+               } else if (curr->get_state() == THREAD_RUNNING) {
                        /* Stopped while running; i.e., completed */
                        curr->complete();
-               else
+               } else {
                        ASSERT(false);
+               }
        }
        next = model->scheduler->next_thread();
+
+       /* Infeasible -> don't take any more steps */
+       if (!model->isfeasible())
+               return 1;
+
        if (next)
                next->set_state(THREAD_RUNNING);
        DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
+
+       /* next == NULL -> don't take any more steps */
        if (!next)
                return 1;
+       /* Return non-zero only if swap fails with an error */
        return Thread::swap(model->get_system_context(), next);
 }
 
 /** The thread_wait_finish method runs the current execution until we
  *  have no more steps to take.
  */
-
 static void thread_wait_finish(void) {
        DBG();
 
        while (!thread_system_next());
 }
 
+static void parse_options(struct model_params *params, int argc, char **argv) {
+}
 
-/** The real_main function contains the main model checking loop. */
+int main_argc;
+char **main_argv;
 
-void real_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);
+
+       //Initialize race detector
+       initRaceDetector();
 
        //Create the singleton SnapshotStack object
        snapshotObject = new SnapshotStack();
 
-       model = new ModelChecker();
+       model = new ModelChecker(params);
 
        if (getcontext(&main_context))
                return;
@@ -66,7 +86,6 @@ void real_main() {
        model->set_system_context(&main_context);
 
        snapshotObject->snapshotStep(0);
-
        do {
                /* Start user program */
                model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
@@ -80,17 +99,13 @@ void real_main() {
        DEBUG("Exiting\n");
 }
 
-int main_numargs;
-char ** main_args;
-
 /**
  * Main function.  Just initializes snapshotting library and the
  * snapshotting library calls the real_main function.
  */
-int main(int numargs, char ** args) {
-       /* Stash this stuff in case someone wants it eventually */
-       main_numargs=numargs;
-       main_args=args;
+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);