X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=300306a461bc6c4f1f9f902239bb285567d8c493;hb=9c42c31b487bf7319dba4d43e417e29420306977;hp=31184fc559e6a6dc524f47bd58e60f8c7920c21e;hpb=6212d5c302f96afb0c0c4497f7292f061d62be0c;p=model-checker.git

diff --git a/main.cc b/main.cc
index 31184fc..300306a 100644
--- a/main.cc
+++ b/main.cc
@@ -17,6 +17,8 @@
 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) {
@@ -30,13 +32,17 @@ static void print_usage(struct model_params *params) {
 "-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->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 = "hm:s:";
+	const char *shortopts = "hm:s:f:e:";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
@@ -47,6 +53,12 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 		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;
@@ -105,5 +117,5 @@ int main(int argc, char ** argv) {
 	main_argv = argv;
 
 	/* Let's jump in quickly and start running stuff */
-	initSnapShotLibrary(10000, 1024, 1024, 1000, &real_main);
+	initSnapshotLibrary(10000, 1024, 1024, 4000, &real_main);
 }