/* global "model" object */
#include "model.h"
+#include "params.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->verbose = 0;
+ params->expireslop = 4;
+ params->verbose = !!DBG_ENABLED();
+ params->uninitvalue = 0;
}
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"
"-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"
+"-c Use SC Trace Analysis.\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 = "hycm:M:s:S:f:e:b:u:v";
int opt;
bool error = false;
while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
case 'v':
params->verbose = 1;
break;
+ case 'u':
+ params->uninitvalue = atoi(optarg);
+ break;
+ case 'c':
+ params->sc_trace_analysis = true;
+ break;
+ case 'y':
+ params->yieldon = true;
+ break;
default: /* '?' */
error = true;
break;
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()
{
//Initialize race detector
initRaceDetector();
- //Create the singleton SnapshotStack object
- snapshotObject = new SnapshotStack();
+ snapshot_stack_init();
model = new ModelChecker(params);
- snapshotObject->snapshotStep(0);
+ install_trace_analyses(model->get_execution());
+
+ snapshot_record(0);
model->run();
delete model;
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);
}