X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=64564012fa634f6281ee7d6834facd2ce4dc3da4;hb=1a2fb82a5c26ec83fb05d0fa208662cf98f4758b;hp=853654ccd35626c8410842f15419b265accd2dbb;hpb=28e1bf20ea2bc74d7376b7cd1bfce0fc409bcde9;p=model-checker.git

diff --git a/main.cc b/main.cc
index 853654c..6456401 100644
--- a/main.cc
+++ b/main.cc
@@ -4,9 +4,10 @@
 
 #include <unistd.h>
 
-#include "libthreads.h"
+#include <threads.h>
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
+#include "output.h"
 
 #include "datarace.h"
 
@@ -19,30 +20,42 @@ static void param_defaults(struct model_params * params) {
 	params->maxfuturedelay = 100;
 	params->fairwindow = 0;
 	params->enabledcount = 1;
+	params->bound = 0;
+	params->maxfuturevalues = 0;
+	params->expireslop = 10;
+	params->verbose = 0;
 }
 
 static void print_usage(struct model_params *params) {
-	printf(
+	/* Reset defaults before printing */
+	param_defaults(params);
+
+	model_print(
 "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"
+"-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"
+"-v                    Print verbose execution information.\n"
 "--                    Program arguments follow.\n\n",
-params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount);
+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:";
+	const char *shortopts = "hm:M:s:S:f:e:b:v";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
@@ -53,22 +66,36 @@ 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;
 		case 'e':
 			params->enabledcount = atoi(optarg);
 			break;
+		case 'b':
+			params->bound = atoi(optarg);
+			break;
 		case 'm':
 			params->maxreads = atoi(optarg);
 			break;
+		case 'M':
+			params->maxfuturevalues = atoi(optarg);
+			break;
+		case 'v':
+			params->verbose = 1;
+			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);
@@ -79,13 +106,16 @@ char **main_argv;
 
 /** The model_main function contains the main model checking loop. */
 static void model_main() {
-	thrd_t user_thread;
 	struct model_params params;
 
 	param_defaults(&params);
 
 	parse_options(&params, &main_argc, &main_argv);
 
+	/* Pass remaining arguments to user program */
+	params.argc = main_argc;
+	params.argv = main_argv;
+
 	//Initialize race detector
 	initRaceDetector();
 
@@ -93,16 +123,8 @@ static void model_main() {
 	snapshotObject = new SnapshotStack();
 
 	model = new ModelChecker(params);
-
 	snapshotObject->snapshotStep(0);
-	do {
-		/* Start user program */
-		model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
-
-		/* Wait for all threads to complete */
-		model->finish_execution();
-	} while (model->next_execution());
-
+	model->run();
 	delete model;
 
 	DEBUG("Exiting\n");
@@ -116,6 +138,9 @@ int main(int argc, char ** argv) {
 	main_argc = argc;
 	main_argv = argv;
 
+	/* Configure output redirection for the model-checker */
+	redirect_output();
+
 	/* Let's jump in quickly and start running stuff */
 	initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
 }