X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=main.cc;h=590a41d27f33c07118592912fc73f582a4624050;hp=df8b8776610a40a83ffc7b04540ccdc400586b70;hb=7d703e06ecec3abb3c173378e18ad6c28eb6f3d7;hpb=1b2081fd7a99dd894f75b8606073d3eae57a0013

diff --git a/main.cc b/main.cc
index df8b8776..590a41d2 100644
--- a/main.cc
+++ b/main.cc
@@ -17,12 +17,13 @@
 #include "snapshot-interface.h"
 #include "plugins.h"
 
-static void param_defaults(struct model_params *params)
+void param_defaults(struct model_params *params)
 {
 	params->verbose = !!DBG_ENABLED();
 	params->uninitvalue = 0;
 	params->maxexecutions = 10;
 	params->nofork = false;
+	params->threadsnocleanup = false;
 }
 
 static void print_usage(const char *program_name, struct model_params *params)
@@ -56,6 +57,9 @@ static void print_usage(const char *program_name, struct model_params *params)
 		"                            Default: %u\n"
 		"                            -o help for a list of options\n"
 		"-n                          No fork\n"
+#ifdef TLS
+		"-d                          Don't allow threads to cleanup\n"
+#endif
 		" --                         Program arguments follow.\n\n",
 		program_name,
 		params->verbose,
@@ -86,7 +90,7 @@ bool install_plugin(char * name) {
 
 static void parse_options(struct model_params *params, int argc, char **argv)
 {
-	const char *shortopts = "hnt:o:u:x:v::";
+	const char *shortopts = "hdnt:o:u:x:v::";
 	const struct option longopts[] = {
 		{"help", no_argument, NULL, 'h'},
 		{"verbose", optional_argument, NULL, 'v'},
@@ -103,9 +107,12 @@ static void parse_options(struct model_params *params, int argc, char **argv)
 		case 'h':
 			print_usage(argv[0], params);
 			break;
-	        case 'n':
-		  params->nofork = true;
-		  break;
+		case 'd':
+			params->threadsnocleanup = true;
+			break;
+		case 'n':
+			params->nofork = true;
+			break;
 		case 'x':
 			params->maxexecutions = atoi(optarg);
 			break;
@@ -161,33 +168,6 @@ static void install_trace_analyses(ModelExecution *execution)
 	}
 }
 
-/** The model_main function contains the main model checking loop. */
-static void model_main()
-{
-	struct model_params params;
-
-	param_defaults(&params);
-	register_plugins();
-
-	parse_options(&params, main_argc, main_argv);
-
-	//Initialize race detector
-	initRaceDetector();
-
-	snapshot_stack_init();
-
-	if (!model)
-		model = new ModelChecker();
-	model->setParams(params);
-	install_trace_analyses(model->get_execution());
-
-	snapshot_record(0);
-	model->run();
-	delete model;
-
-	DEBUG("Exiting\n");
-}
-
 /**
  * Main function.  Just initializes snapshotting library and the
  * snapshotting library calls the model_main function.
@@ -198,20 +178,37 @@ int main(int argc, char **argv)
 	main_argv = argv;
 
 	/*
-	 * If this printf statement is removed, CDSChecker will fail on an
+	 * 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("CDSChecker\n"
-				 "Copyright (c) 2013 Regents of the University of California. All rights reserved.\n"
+	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 Brian Norris and Brian Demsky\n\n");
+				 "Written by Weiyu Luo, Brian Norris, and Brian Demsky\n\n");
+
+
+	//Initialize snapshotting library and model checker object
+	if (!model) {
+		snapshot_system_init(10000, 1024, 1024, 40000);
+		model = new ModelChecker();
+		model->startChecker();
+	}
 
 	/* Configure output redirection for the model-checker */
 	redirect_output();
 
-	/* Let's jump in quickly and start running stuff */
-	snapshot_system_init(10000, 1024, 1024, 40000, &model_main);
+	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");
 }