X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=main.cc;h=dc3f6f4dca002d6e763e5bbf25068260d3edc828;hp=b58599df76681bdae923157b84d47f16a42681e1;hb=963f325c5b5df37487e17c3a05f4d15efabb8870;hpb=1bc8782b55cab0503f1b64529f993f0b9e3a1846

diff --git a/main.cc b/main.cc
index b58599df..dc3f6f4d 100644
--- a/main.cc
+++ b/main.cc
@@ -4,9 +4,8 @@
 
 #include <unistd.h>
 
-#include "libthreads.h"
 #include "common.h"
-#include "threads.h"
+#include "output.h"
 
 #include "datarace.h"
 
@@ -14,28 +13,53 @@
 #include "model.h"
 #include "snapshot-interface.h"
 
-static void param_defaults(struct model_params * params) {
+static void param_defaults(struct model_params *params)
+{
 	params->maxreads = 0;
-  params->maxfuturedelay = 100;
+	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(
+static void print_usage(struct model_params *params)
+{
+	/* 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 while other writes exist. Default: %d\n"
-"-s                    Maximum actions that the model checker will wait for a write from the future past the expected number of actions.  Default: %d\n"
-"--                    Program arguments follow.\n\n", params->maxreads, params->maxfuturedelay);
+"-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->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:";
+static void parse_options(struct model_params *params, int argc, char **argv)
+{
+	const char *shortopts = "hm:M:s:S:f:e:b:v";
 	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(params);
@@ -43,16 +67,42 @@ 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;
+
+	/* Pass remaining arguments to user program */
+	params->argc = argc - (optind - 1);
+	params->argv = argv + (optind - 1);
+
+	/* Reset program name */
+	params->argv[0] = argv[0];
+
+	/* Reset (global) optind for potential use by user program */
+	optind = 1;
 
 	if (error)
 		print_usage(params);
@@ -61,32 +111,23 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 int main_argc;
 char **main_argv;
 
-/** The real_main function contains the main model checking loop. */
-static void real_main() {
-	thrd_t user_thread;
+/** The model_main function contains the main model checking loop. */
+static void model_main()
+{
 	struct model_params params;
 
 	param_defaults(&params);
 
-	parse_options(&params, &main_argc, &main_argv);
+	parse_options(&params, main_argc, main_argv);
 
 	//Initialize race detector
 	initRaceDetector();
 
-	//Create the singleton SnapshotStack object
-	snapshotObject = new SnapshotStack();
+	snapshot_stack_init();
 
 	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());
-
+	snapshot_record(0);
+	model->run();
 	delete model;
 
 	DEBUG("Exiting\n");
@@ -94,12 +135,16 @@ static void real_main() {
 
 /**
  * Main function.  Just initializes snapshotting library and the
- * snapshotting library calls the real_main function.
+ * snapshotting library calls the model_main function.
  */
-int main(int argc, char ** argv) {
+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, 1000, &real_main);
+	snapshot_system_init(10000, 1024, 1024, 4000, &model_main);
 }