X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=main.cc;h=f79366fb2d8450bcbbe69373ac45db600aec8caa;hp=635b8da70bc213e3db6524c964e78301b1b28ebf;hb=80f5924fb6c148ecb703dfeae5a751948062588b;hpb=5a44bb763cbcb85792ea59b07175a56342b63c59

diff --git a/main.cc b/main.cc
index 635b8da7..f79366fb 100644
--- a/main.cc
+++ b/main.cc
@@ -7,6 +7,7 @@
 #include <threads.h>
 #include "common.h"
 #include "threads-model.h"
+#include "output.h"
 
 #include "datarace.h"
 
@@ -20,31 +21,39 @@ static void param_defaults(struct model_params * params) {
 	params->fairwindow = 0;
 	params->enabledcount = 1;
 	params->bound = 0;
+	params->maxfuturevalues = 0;
+	params->expireslop = 10;
 }
 
 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"
 "--                    Program arguments follow.\n\n",
-params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount, params->bound);
+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:b:";
+	const char *shortopts = "hm:M:s:S:f:e:b:";
 	int opt;
 	bool error = false;
 	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
@@ -55,6 +64,9 @@ 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;
@@ -67,6 +79,9 @@ static void parse_options(struct model_params *params, int *argc, char ***argv)
 		case 'm':
 			params->maxreads = atoi(optarg);
 			break;
+		case 'M':
+			params->maxfuturevalues = atoi(optarg);
+			break;
 		default: /* '?' */
 			error = true;
 			break;
@@ -116,6 +131,8 @@ static void model_main() {
 		model->finish_execution();
 	} while (model->next_execution());
 
+	model->print_stats();
+
 	delete model;
 
 	DEBUG("Exiting\n");
@@ -129,6 +146,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);
 }