X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=main.cc;h=2a4119a6acb940e615f1342eb715732c13427357;hb=2693d3e8789d9f06a66aa9cd612a395c2cf649ea;hp=300306a461bc6c4f1f9f902239bb285567d8c493;hpb=f767539fdf7a145b4208be0c30d2fa1aa095e6db;p=model-checker.git

diff --git a/main.cc b/main.cc
index 300306a..2a4119a 100644
--- a/main.cc
+++ b/main.cc
@@ -77,8 +77,14 @@ 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() {
+/** 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;
 
@@ -97,7 +103,7 @@ static void real_main() {
 	snapshotObject->snapshotStep(0);
 	do {
 		/* Start user program */
-		model->add_thread(new Thread(&user_thread, (void (*)(void *)) &user_main, NULL));
+		model->add_thread(new Thread(&user_thread, &wrapper_user_main, NULL));
 
 		/* Wait for all threads to complete */
 		model->finish_execution();
@@ -110,12 +116,12 @@ 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) {
 	main_argc = argc;
 	main_argv = argv;
 
 	/* Let's jump in quickly and start running stuff */
-	initSnapshotLibrary(10000, 1024, 1024, 4000, &real_main);
+	initSnapshotLibrary(10000, 1024, 1024, 4000, &model_main);
 }