X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=main.cc;h=5396823334df9a0b47f3077f3c352cc6774e7e1b;hp=635b8da70bc213e3db6524c964e78301b1b28ebf;hb=651e9182baf50ef1e235ad7a587730b989bb44c7;hpb=79f51bf7df7ed2c8095b0c2d7f730db6ccb9394a

diff --git a/main.cc b/main.cc
index 635b8da7..53968233 100644
--- a/main.cc
+++ b/main.cc
@@ -3,132 +3,204 @@
  */
 
 #include <unistd.h>
+#include <getopt.h>
+#include <string.h>
 
-#include <threads.h>
 #include "common.h"
-#include "threads-model.h"
+#include "output.h"
 
 #include "datarace.h"
 
 /* global "model" object */
 #include "model.h"
+#include "params.h"
 #include "snapshot-interface.h"
+#include "plugins.h"
 
-static void param_defaults(struct model_params * params) {
-	params->maxreads = 0;
-	params->maxfuturedelay = 100;
-	params->fairwindow = 0;
-	params->enabledcount = 1;
-	params->bound = 0;
+void param_defaults(struct model_params *params)
+{
+	params->verbose = !!DBG_ENABLED();
+	params->uninitvalue = 0;
+	params->maxexecutions = 10;
+	params->nofork = false;
 }
 
-static void print_usage(struct model_params *params) {
-	printf(
-"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"
-"-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"
-"-b                    Upper length bound. Default: %d\n"
-"--                    Program arguments follow.\n\n",
-params->maxreads, params->maxfuturedelay, params->fairwindow, params->enabledcount, params->bound);
+static void print_usage(const char *program_name, struct model_params *params)
+{
+	ModelVector<TraceAnalysis *> * registeredanalysis=getRegisteredTraceAnalysis();
+	/* Reset defaults before printing */
+	param_defaults(params);
+
+	model_print(
+		"Copyright (c) 2013 Regents of the University of California. All rights reserved.\n"
+		"Distributed under the GPLv2\n"
+		"Written by Brian Norris and Brian Demsky\n"
+		"\n"
+		"Usage: %s [MODEL-CHECKER OPTIONS] -- [PROGRAM ARGS]\n"
+		"\n"
+		"MODEL-CHECKER OPTIONS can be any of the model-checker options listed below. Arguments\n"
+		"provided after the `--' (the PROGRAM ARGS) are passed to the user program.\n"
+		"\n"
+		"Model-checker options:\n"
+		"-h, --help                  Display this help message and exit\n"
+		"-v[NUM], --verbose[=NUM]    Print verbose execution information. NUM is optional:\n"
+		"                              0 is quiet; 1 shows valid executions; 2 is noisy;\n"
+		"                              3 is noisier.\n"
+		"                              Default: %d\n"
+		"-u, --uninitialized=VALUE   Return VALUE any load which may read from an\n"
+		"                              uninitialized atomic.\n"
+		"                              Default: %u\n"
+		"-t, --analysis=NAME         Use Analysis Plugin.\n"
+		"-o, --options=NAME          Option for previous analysis plugin.  \n"
+		"-x, --maxexec=NUM           Maximum number of executions.\n"
+		"                            Default: %u\n"
+		"                            -o help for a list of options\n"
+		"-n                          No fork\n"
+		" --                         Program arguments follow.\n\n",
+		program_name,
+		params->verbose,
+		params->uninitvalue,
+		params->maxexecutions);
+	model_print("Analysis plugins:\n");
+	for(unsigned int i=0;i<registeredanalysis->size();i++) {
+		TraceAnalysis * analysis=(*registeredanalysis)[i];
+		model_print("%s\n", analysis->name());
+	}
 	exit(EXIT_SUCCESS);
 }
 
-static void parse_options(struct model_params *params, int *argc, char ***argv) {
-	const char *shortopts = "hm:s:f:e:b:";
-	int opt;
+bool install_plugin(char * name) {
+	ModelVector<TraceAnalysis *> * registeredanalysis=getRegisteredTraceAnalysis();
+	ModelVector<TraceAnalysis *> * installedanalysis=getInstalledTraceAnalysis();
+
+	for(unsigned int i=0;i<registeredanalysis->size();i++) {
+		TraceAnalysis * analysis=(*registeredanalysis)[i];
+		if (strcmp(name, analysis->name())==0) {
+			installedanalysis->push_back(analysis);
+			return false;
+		}
+	}
+	model_print("Analysis %s Not Found\n", name);
+	return true;
+}
+
+static void parse_options(struct model_params *params, int argc, char **argv)
+{
+	const char *shortopts = "hnt:o:u:x:v::";
+	const struct option longopts[] = {
+		{"help", no_argument, NULL, 'h'},
+		{"verbose", optional_argument, NULL, 'v'},
+		{"uninitialized", required_argument, NULL, 'u'},
+		{"analysis", required_argument, NULL, 't'},
+		{"options", required_argument, NULL, 'o'},
+		{"maxexecutions", required_argument, NULL, 'x'},
+		{0, 0, 0, 0}	/* Terminator */
+	};
+	int opt, longindex;
 	bool error = false;
-	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
+	while (!error && (opt = getopt_long(argc, argv, shortopts, longopts, &longindex)) != -1) {
 		switch (opt) {
 		case 'h':
-			print_usage(params);
+			print_usage(argv[0], params);
 			break;
-		case 's':
-			params->maxfuturedelay = atoi(optarg);
+		case 'n':
+			params->nofork = true;
 			break;
-		case 'f':
-			params->fairwindow = atoi(optarg);
+		case 'x':
+			params->maxexecutions = atoi(optarg);
 			break;
-		case 'e':
-			params->enabledcount = atoi(optarg);
+		case 'v':
+			params->verbose = optarg ? atoi(optarg) : 1;
 			break;
-		case 'b':
-			params->bound = atoi(optarg);
+		case 'u':
+			params->uninitvalue = atoi(optarg);
 			break;
-		case 'm':
-			params->maxreads = atoi(optarg);
+		case 't':
+			if (install_plugin(optarg))
+				error = true;
 			break;
-		default: /* '?' */
+		case 'o':
+		{
+			ModelVector<TraceAnalysis *> * analyses = getInstalledTraceAnalysis();
+			if ( analyses->size() == 0 || (*analyses)[analyses->size()-1]->option(optarg))
+				error = true;
+		}
+		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)
-		print_usage(params);
+		print_usage(argv[0], params);
 }
 
 int main_argc;
 char **main_argv;
 
-/** Wrapper to run the user's main function, with appropriate arguments */
-void wrapper_user_main(void *)
+static void install_trace_analyses(ModelExecution *execution)
 {
-	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);
-
-	//Initialize race detector
-	initRaceDetector();
-
-	//Create the singleton SnapshotStack object
-	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());
-
-	delete model;
-
-	DEBUG("Exiting\n");
+	ModelVector<TraceAnalysis *> * installedanalysis=getInstalledTraceAnalysis();
+	for(unsigned int i=0;i<installedanalysis->size();i++) {
+		TraceAnalysis * ta=(*installedanalysis)[i];
+		ta->setExecution(execution);
+		model->add_trace_analysis(ta);
+		/** Call the installation event for each installed plugin */
+		ta->actionAtInstallation();
+	}
 }
 
 /**
  * Main function.  Just initializes snapshotting library and the
  * 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;
 
-	/* Let's jump in quickly and start running stuff */
-	initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
+	/*
+	 * If this printf statement is removed, C11Tester will fail on an
+	 * assert on some versions of glibc.  The first time printf is
+	 * called, it allocated internal buffers.  We can't easily snapshot
+	 * libc since we also use it.
+	 */
+
+	printf("C11Tester\n"
+				 "Copyright (c) 2013 and 2019 Regents of the University of California. All rights reserved.\n"
+				 "Distributed under the GPLv2\n"
+				 "Written by Weiyu Luo, Brian Norris, and Brian Demsky\n\n");
+
+	/* Configure output redirection for the model-checker */
+	redirect_output();
+
+	//Initialize snapshotting library and model checker object
+	if (!model) {
+		snapshot_system_init(10000, 1024, 1024, 40000);
+		model = new ModelChecker();
+		model->startChecker();
+	}
+
+	register_plugins();
+
+	//Parse command line options
+	model_params *params = model->getParams();
+	parse_options(params, main_argc, main_argv);
+
+
+	install_trace_analyses(model->get_execution());
+
+	model->startMainThread();
+	DEBUG("Exiting\n");
 }