add some support for traceanalysis plugins

[model-checker.git] / main.cc

diff --git a/main.cc b/main.cc
index fd9536785bf763fc85e87e923f19e137ff8a1122..fa7075408f7d16c8bf92a00abfb13b0e0c878d5d 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -12,17 +12,19 @@
 /* global "model" object */
 #include "model.h"
 #include "snapshot-interface.h"
+#include "scanalysis.h"
 
 static void param_defaults(struct model_params *params)
 {
        params->maxreads = 0;
-       params->maxfuturedelay = 100;
+       params->maxfuturedelay = 6;
        params->fairwindow = 0;
        params->yieldon = false;
+       params->sc_trace_analysis = false;
        params->enabledcount = 1;
        params->bound = 0;
        params->maxfuturevalues = 0;
-       params->expireslop = 10;
+       params->expireslop = 4;
        params->verbose = !!DBG_ENABLED();
        params->uninitvalue = 0;
 }
@@ -35,6 +37,8 @@ static void print_usage(struct model_params *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"
@@ -56,6 +60,7 @@ static void print_usage(struct model_params *params)
 "-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);
        exit(EXIT_SUCCESS);
@@ -63,7 +68,7 @@ params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expir
 
 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 = "hymc:M:s:S:f:e:b:u:v";
        int opt;
        bool error = false;
        while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
@@ -98,6 +103,9 @@ 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;
@@ -124,6 +132,11 @@ static void parse_options(struct model_params *params, int argc, char **argv)
 int main_argc;
 char **main_argv;
 
+void install_trace_analyses() {
+       if (model->params.sc_trace_analysis)
+               model->add_trace_analysis(new SCAnalysis());
+}
+
 /** The model_main function contains the main model checking loop. */
 static void model_main()
 {
@@ -139,6 +152,8 @@ static void model_main()
        snapshot_stack_init();
 
        model = new ModelChecker(params);
+       install_trace_analyses();
+
        snapshot_record(0);
        model->run();
        delete model;