X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=56eb311dd86f755d45989972d1fe165be74c60a2;hb=823d6e43187ba7ba3ff802f0ef9306faa51fe5f9;hp=ab37af4cc02fa3368906ff8537ce56dd637d9d98;hpb=ea4611c1fc3b580020afbc04d531e4bc10fcca9c;p=model-checker.git

diff --git a/main.cc b/main.cc
index ab37af4..56eb311 100644
--- a/main.cc
+++ b/main.cc
@@ -11,18 +11,21 @@
 
 /* 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->expireslop = 4;
 	params->verbose = !!DBG_ENABLED();
 	params->uninitvalue = 0;
 }
@@ -33,6 +36,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"
@@ -54,6 +61,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);
@@ -61,7 +69,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 = "hycm:M:s:S:f:e:b:u:v";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
@@ -96,6 +104,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;
@@ -122,6 +133,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()
 {
@@ -137,6 +154,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;