X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=main.cc;h=d69e9e06e219b994a10f7ed398520ad5bd32a818;hb=11da849ab540fbcec939797a0c5ef17d651829e7;hp=dc3f6f4dca002d6e763e5bbf25068260d3edc828;hpb=89a750a6ec0a040f73d3291e6791b3d142123f25;p=model-checker.git

diff --git a/main.cc b/main.cc
index dc3f6f4..d69e9e0 100644
--- a/main.cc
+++ b/main.cc
@@ -18,11 +18,12 @@ 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();
 }
 
 static void print_usage(struct model_params *params)
@@ -46,17 +47,19 @@ 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"
 "--                    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);
 	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:v";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
@@ -88,6 +91,9 @@ static void parse_options(struct model_params *params, int argc, char **argv)
 		case 'v':
 			params->verbose = 1;
 			break;
+		case 'y':
+			params->yieldon = true;
+			break;
 		default: /* '?' */
 			error = true;
 			break;