X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=e8d4f9af356f4ac6a59ab21f69fc26d6bd2d12bb;hb=6f2d14687b0bc7063946d5dfca05cf47330eef4e;hp=bff111f09dc28a99eff0ff2b70b4526141f39737;hpb=e60d8c23d30a0dfe66b8426f7f2ecf576e812028;p=c11tester.git

diff --git a/main.cc b/main.cc
index bff111f0..e8d4f9af 100644
--- a/main.cc
+++ b/main.cc
@@ -4,7 +4,7 @@
 
 #include <unistd.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
 #include "threads-model.h"
 
@@ -19,9 +19,13 @@ static void param_defaults(struct model_params * params) {
 	params->maxfuturedelay = 100;
 	params->fairwindow = 0;
 	params->enabledcount = 1;
+	params->bound = 0;
 }
 
 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"
@@ -36,13 +40,14 @@ static void print_usage(struct model_params *params) {
 "                      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->maxreads, params->maxfuturedelay, 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:";
+	const char *shortopts = "hm:s:f:e:b:";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
@@ -59,6 +64,9 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 		case 'e':
 			params->enabledcount = atoi(optarg);
 			break;
+		case 'b':
+			params->bound = atoi(optarg);
+			break;
 		case 'm':
 			params->maxreads = atoi(optarg);
 			break;
@@ -67,8 +75,10 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 			break;
 		}
 	}
-	(*argc) -= optind;
-	(*argv) += optind;
+	(*argv)[optind - 1] = (*argv)[0];
+	(*argc) -= (optind - 1);
+	(*argv) += (optind - 1);
+	optind = 1;
 
 	if (error)
 		print_usage(params);