X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=main.cc;h=bc8a08ec6f05b5c7848feb6d8d474db793add8b0;hp=1aafb696c8f80bd5974957a47eb2c9e0b6324d51;hb=7966c737f2a88e5e1a56817eb9f6fdaead3eca92;hpb=b76705db31ea3cc095400bb870114ee92f834201

diff --git a/main.cc b/main.cc
index 1aafb696..bc8a08ec 100644
--- a/main.cc
+++ b/main.cc
@@ -4,9 +4,8 @@
 
 #include <unistd.h>
 
-#include <threads.h>
 #include "common.h"
-#include "threads-model.h"
+#include "output.h"
 
 #include "datarace.h"
 
@@ -21,14 +20,15 @@ static void param_defaults(struct model_params * params) {
 	params->enabledcount = 1;
 	params->bound = 0;
 	params->maxfuturevalues = 0;
-	params->expireslop = 2;
+	params->expireslop = 10;
+	params->verbose = 0;
 }
 
 static void print_usage(struct model_params *params) {
 	/* Reset defaults before printing */
 	param_defaults(params);
 
-	printf(
+	model_print(
 "Usage: <program name> [MC_OPTIONS] -- [PROGRAM ARGUMENTS]\n"
 "\n"
 "Options:\n"
@@ -46,16 +46,17 @@ static void print_usage(struct model_params *params) {
 "                      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:M:s:S:f:e:b:";
+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);
@@ -81,14 +82,23 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 		case 'M':
 			params->maxfuturevalues = atoi(optarg);
 			break;
+		case 'v':
+			params->verbose = 1;
+			break;
 		default: /* '?' */
 			error = true;
 			break;
 		}
 	}
-	(*argv)[optind - 1] = (*argv)[0];
-	(*argc) -= (optind - 1);
-	(*argv) += (optind - 1);
+
+	/* 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)
@@ -98,20 +108,13 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 int main_argc;
 char **main_argv;
 
-/** Wrapper to run the user's main function, with appropriate arguments */
-void wrapper_user_main(void *)
-{
-	user_main(main_argc, 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);
+	parse_options(&params, main_argc, main_argv);
 
 	//Initialize race detector
 	initRaceDetector();
@@ -120,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, &wrapper_user_main, NULL));
-
-		/* Wait for all threads to complete */
-		model->finish_execution();
-	} while (model->next_execution());
-
+	model->run();
 	delete model;
 
 	DEBUG("Exiting\n");
@@ -143,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);
 }