deal with looping due to bogus future value via promise expiration

[c11tester.git] / main.cc

diff --git a/main.cc b/main.cc
index 3dff4f424ce2a2b36aa3c1fa7fc8819f30c89af3..b58599df76681bdae923157b84d47f16a42681e1 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -2,77 +2,89 @@
  *  @brief Entry point for the model checker.
  */
 
+#include <unistd.h>
+
 #include "libthreads.h"
 #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.
- */
-
-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 param_defaults(struct model_params * params) {
+       params->maxreads = 0;
+  params->maxfuturedelay = 100;
 }
 
-/** The thread_wait_finish method runs the current execution until we
- *  have no more steps to take.
- */
+static void print_usage(struct model_params *params) {
+       printf(
+"Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
+"\n"
+"Options:\n"
+"-h                    Display this help message and exit\n"
+"-m                    Maximum times a thread can read from the same write while other writes exist. Default: %d\n"
+"-s                    Maximum actions that the model checker will wait for a write from the future past the expected number of actions.  Default: %d\n"
+"--                    Program arguments follow.\n\n", params->maxreads, params->maxfuturedelay);
+       exit(EXIT_SUCCESS);
+}
 
-static void thread_wait_finish(void) {
-       DBG();
+static void parse_options(struct model_params *params, int *argc, char ***argv) {
+       const char *shortopts = "hm:s:";
+       int opt;
+       bool error = false;
+       while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
+               switch (opt) {
+               case 'h':
+                       print_usage(params);
+                       break;
+               case 's':
+                       params->maxfuturedelay = atoi(optarg);
+                       break;
+               case 'm':
+                       params->maxreads = atoi(optarg);
+                       break;
+               default: /* '?' */
+                       error = true;
+                       break;
+               }
+       }
+       (*argc) -= optind;
+       (*argv) += optind;
 
-       while (!thread_system_next());
+       if (error)
+               print_usage(params);
 }
 
+int main_argc;
+char **main_argv;
 
 /** 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;
 
-       //Create the singleton SnapshotStack object
-       snapshotObject = new SnapshotStack();
+       param_defaults(&params);
+
+       parse_options(&params, &main_argc, &main_argv);
 
-       model = new ModelChecker();
+       //Initialize race detector
+       initRaceDetector();
 
-       if (getcontext(&main_context))
-               return;
+       //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, (void (*)(void *)) &user_main, NULL));
 
                /* Wait for all threads to complete */
-               thread_wait_finish();
+               model->finish_execution();
        } while (model->next_execution());
 
        delete model;
@@ -80,17 +92,13 @@ static 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);