X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=fc1b2779daa657ae6460293da49d29a5c95ec21d;hb=547377c72c02a7831b63f5c7aa2ac2559109907c;hp=2a4119a6acb940e615f1342eb715732c13427357;hpb=b59d5f84ac4800cc144fc7c8837d96181423d9ae;p=model-checker.git

diff --git a/main.cc b/main.cc
index 2a4119a..fc1b277 100644
--- a/main.cc
+++ b/main.cc
@@ -4,9 +4,9 @@
 
 #include <unistd.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 #include "datarace.h"
 
@@ -19,6 +19,7 @@ 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) {
@@ -36,13 +37,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 +61,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;