add our names

[model-checker.git] / main.cc

diff --git a/main.cc b/main.cc
index a1115721436706f2007d23cd7fc4c4733f09c28f..a10bec364c0633ee569306b89243b3f1283fc3d6 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -18,11 +18,13 @@ static void param_defaults(struct model_params *params)
        params->maxreads = 0;
        params->maxfuturedelay = 100;
        params->fairwindow = 0;
+       params->yieldon = false;
        params->enabledcount = 1;
        params->bound = 0;
        params->maxfuturevalues = 0;
        params->expireslop = 10;
-       params->verbose = 0;
+       params->verbose = !!DBG_ENABLED();
+       params->uninitvalue = 0;
 }
 
 static void print_usage(struct model_params *params)
@@ -31,6 +33,10 @@ static void print_usage(struct model_params *params)
        param_defaults(params);
 
        model_print(
+"Copyright (c) 2013 Regents of the University of California. All rights reserved.\n"
+"Distributed under the GPLv2\n"
+"Written by Brian Norris and Brian Demsky\n"
+"\n"
 "Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
 "\n"
 "Options:\n"
@@ -46,17 +52,20 @@ static void print_usage(struct model_params *params)
 "-f                    Specify a fairness window in which actions that are\n"
 "                      enabled sufficiently many times should receive\n"
 "                      priority for execution. Default: %d\n"
+"-y                    Turn on CHESS yield-based fairness support.\n"
+"                      Default: %d\n"
 "-e                    Enabled count. Default: %d\n"
 "-b                    Upper length bound. Default: %d\n"
 "-v                    Print verbose execution information.\n"
+"-u                    Value for uninitialized reads. Default: %u\n"
 "--                    Program arguments follow.\n\n",
-params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->enabledcount, params->bound);
+params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->yieldon, params->enabledcount, params->bound, params->uninitvalue);
        exit(EXIT_SUCCESS);
 }
 
 static void parse_options(struct model_params *params, int argc, char **argv)
 {
-       const char *shortopts = "hm:M:s:S:f:e:b:v";
+       const char *shortopts = "hym:M:s:S:f:e:b:u:v";
        int opt;
        bool error = false;
        while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
@@ -88,6 +97,12 @@ static void parse_options(struct model_params *params, int argc, char **argv)
                case 'v':
                        params->verbose = 1;
                        break;
+               case 'u':
+                       params->uninitvalue = atoi(optarg);
+                       break;
+               case 'y':
+                       params->yieldon = true;
+                       break;
                default: /* '?' */
                        error = true;
                        break;
@@ -123,11 +138,10 @@ static void model_main()
        //Initialize race detector
        initRaceDetector();
 
-       //Create the singleton SnapshotStack object
-       snapshotObject = new SnapshotStack();
+       snapshot_stack_init();
 
        model = new ModelChecker(params);
-       snapshotObject->snapshotStep(0);
+       snapshot_record(0);
        model->run();
        delete model;
 
@@ -147,5 +161,5 @@ int main(int argc, char **argv)
        redirect_output();
 
        /* Let's jump in quickly and start running stuff */
-       initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
+       snapshot_system_init(10000, 1024, 1024, 4000, &model_main);
 }