execution: improve yield-blocking structure

[model-checker.git] / main.cc

diff --git a/main.cc b/main.cc
index 6459f139d7b01e78ad8b7c3fcfb4ca6cfd26a451..1373e672b6492b9a05dadacd15c92c34620b1fd0 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -11,7 +11,9 @@
 
 /* global "model" object */
 #include "model.h"
+#include "params.h"
 #include "snapshot-interface.h"
+#include "scanalysis.h"
 
 static void param_defaults(struct model_params *params)
 {
@@ -19,6 +21,8 @@ static void param_defaults(struct model_params *params)
        params->maxfuturedelay = 6;
        params->fairwindow = 0;
        params->yieldon = false;
+       params->yieldblock = false;
+       params->sc_trace_analysis = false;
        params->enabledcount = 1;
        params->bound = 0;
        params->maxfuturevalues = 0;
@@ -54,18 +58,21 @@ static void print_usage(struct model_params *params)
 "                      priority for execution. Default: %d\n"
 "-y                    Turn on CHESS yield-based fairness support.\n"
 "                      Default: %d\n"
+"-Y                    Prohibit an execution from running a yield.\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"
+"-c                    Use SC Trace Analysis.\n"
 "--                    Program arguments follow.\n\n",
-params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->yieldon, params->enabledcount, params->bound, params->uninitvalue);
+params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->yieldon, params->yieldblock, params->enabledcount, params->bound, params->uninitvalue);
        exit(EXIT_SUCCESS);
 }
 
 static void parse_options(struct model_params *params, int argc, char **argv)
 {
-       const char *shortopts = "hym:M:s:S:f:e:b:u:v";
+       const char *shortopts = "hyYcm:M:s:S:f:e:b:u:v";
        int opt;
        bool error = false;
        while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
@@ -100,9 +107,15 @@ static void parse_options(struct model_params *params, int argc, char **argv)
                case 'u':
                        params->uninitvalue = atoi(optarg);
                        break;
+               case 'c':
+                       params->sc_trace_analysis = true;
+                       break;
                case 'y':
                        params->yieldon = true;
                        break;
+               case 'Y':
+                       params->yieldblock = true;
+                       break;
                default: /* '?' */
                        error = true;
                        break;
@@ -126,6 +139,12 @@ static void parse_options(struct model_params *params, int argc, char **argv)
 int main_argc;
 char **main_argv;
 
+static void install_trace_analyses(const ModelExecution *execution)
+{
+       if (model->params.sc_trace_analysis)
+               model->add_trace_analysis(new SCAnalysis(execution));
+}
+
 /** The model_main function contains the main model checking loop. */
 static void model_main()
 {
@@ -141,6 +160,8 @@ static void model_main()
        snapshot_stack_init();
 
        model = new ModelChecker(params);
+       install_trace_analyses(model->get_execution());
+
        snapshot_record(0);
        model->run();
        delete model;