X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=26d8beb79d52f8d09a9d16b97f96c79972941822;hb=c1cc5e279bcba4216bde88a63dafac96d3ef47ba;hp=f58f3040d98f0afd3240381445b6de93cbf723b6;hpb=cda45d92fa7a3268dc0fed66e63ca55d251199bc;p=model-checker.git

diff --git a/main.cc b/main.cc
index f58f304..26d8beb 100644
--- a/main.cc
+++ b/main.cc
@@ -14,32 +14,64 @@
 #include "model.h"
 #include "snapshot-interface.h"
 
-static void print_usage() {
+static void param_defaults(struct model_params * params) {
+	params->maxreads = 0;
+	params->maxfuturedelay = 100;
+	params->fairwindow = 0;
+	params->enabledcount = 1;
+}
+
+static void print_usage(struct model_params *params) {
 	printf(
-"Usage: <program name> [OPTIONS]\n"
+"Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
 "\n"
 "Options:\n"
 "-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"
+"-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"
+"-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"
+"--                    Program arguments follow.\n\n",
+params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount);
 	exit(EXIT_SUCCESS);
 }
 
-static void parse_options(struct model_params *params, int argc, char **argv) {
-	const char *shortopts = "h";
+static void parse_options(struct model_params *params, int *argc, char ***argv) {
+	const char *shortopts = "hm:s:f:e:";
 	int opt;
 	bool error = false;
-	while (!error && (opt = getopt(argc, argv, shortopts)) != -1) {
+	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
 		switch (opt) {
 		case 'h':
-			print_usage();
+			print_usage(params);
+			break;
+		case 's':
+			params->maxfuturedelay = atoi(optarg);
+			break;
+		case 'f':
+			params->fairwindow = atoi(optarg);
+			break;
+		case 'e':
+			params->enabledcount = atoi(optarg);
+			break;
+		case 'm':
+			params->maxreads = atoi(optarg);
 			break;
 		default: /* '?' */
 			error = true;
 			break;
 		}
 	}
+	(*argc) -= optind;
+	(*argv) += optind;
+
 	if (error)
-		print_usage();
+		print_usage(params);
 }
 
 int main_argc;
@@ -50,7 +82,9 @@ static void real_main() {
 	thrd_t user_thread;
 	struct model_params params;
 
-	parse_options(&params, main_argc, main_argv);
+	param_defaults(&params);
+
+	parse_options(&params, &main_argc, &main_argv);
 
 	//Initialize race detector
 	initRaceDetector();