X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=fb4acbe75d6b530feabc4e76b111cc0f4bf4b29d;hb=6b87c110fbda87ccec4f58b1e292d5f9434c8691;hp=fc1b2779daa657ae6460293da49d29a5c95ec21d;hpb=4546308ab989c074f83d8607e16f13ffbcff494a;p=model-checker.git

diff --git a/main.cc b/main.cc
index fc1b277..fb4acbe 100644
--- a/main.cc
+++ b/main.cc
@@ -20,9 +20,14 @@ static void param_defaults(struct model_params * params) {
 	params->fairwindow = 0;
 	params->enabledcount = 1;
 	params->bound = 0;
+	params->maxfuturevalues = 0;
+	params->expireslop = 10;
 }
 
 static void print_usage(struct model_params *params) {
+	/* Reset defaults before printing */
+	param_defaults(params);
+
 	printf(
 "Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
 "\n"
@@ -30,21 +35,24 @@ static void print_usage(struct model_params *params) {
 "-h                    Display this help message and exit\n"
 "-m                    Maximum times a thread can read from the same write\n"
 "                      while other writes exist. Default: %d\n"
+"-M                    Maximum number of future values that can be sent to\n"
+"                      the same read. Default: %d\n"
 "-s                    Maximum actions that the model checker will wait for\n"
 "                      a write from the future past the expected number of\n"
 "                      actions. Default: %d\n"
+"-S                    Future value expiration sloppiness. Default: %u\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"
 "-e                    Enabled count. Default: %d\n"
 "-b                    Upper length bound. Default: %d\n"
 "--                    Program arguments follow.\n\n",
-params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount, params->bound);
+params->maxreads, params->maxfuturevalues, params->maxfuturedelay, params->expireslop, params->fairwindow, params->enabledcount, params->bound);
 	exit(EXIT_SUCCESS);
 }
 
 static void parse_options(struct model_params *params, int *argc, char ***argv) {
-	const char *shortopts = "hm:s:f:e:b:";
+	const char *shortopts = "hm:M:s:S:f:e:b:";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
@@ -55,6 +63,9 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 		case 's':
 			params->maxfuturedelay = atoi(optarg);
 			break;
+		case 'S':
+			params->expireslop = atoi(optarg);
+			break;
 		case 'f':
 			params->fairwindow = atoi(optarg);
 			break;
@@ -67,13 +78,18 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 		case 'm':
 			params->maxreads = atoi(optarg);
 			break;
+		case 'M':
+			params->maxfuturevalues = atoi(optarg);
+			break;
 		default: /* '?' */
 			error = true;
 			break;
 		}
 	}
-	(*argc) -= optind;
-	(*argv) += optind;
+	(*argv)[optind - 1] = (*argv)[0];
+	(*argc) -= (optind - 1);
+	(*argv) += (optind - 1);
+	optind = 1;
 
 	if (error)
 		print_usage(params);