X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=main.cc;h=215a2197d35e91fa29cf65b869a292165be4a9ad;hp=800b873e8d8a2f8295d96879eed0b21bd8087ab8;hb=0c61161a061c85189d4d1531a9ad00caf2f2588d;hpb=17446381d6542f54be93ab3d2cc1d274f2a314a7

diff --git a/main.cc b/main.cc
index 800b873..215a219 100644
--- a/main.cc
+++ b/main.cc
@@ -1,86 +1,100 @@
+/** @file main.cc
+ *  @brief Entry point for the model checker.
+ */
+
+#include <unistd.h>
+
 #include "libthreads.h"
 #include "common.h"
 #include "threads.h"
 
+#include "datarace.h"
+
 /* global "model" object */
 #include "model.h"
-#include "snapshot.h"
 #include "snapshot-interface.h"
 
-/*
- * Return 1 if found next thread, 0 otherwise
- */
-int num;
-int num1;
-int num2;
-
-static int thread_system_next(void) {
-  Thread *curr, *next;
-  
-  curr = thread_current();
-  if (curr) {
-    if (curr->get_state() == THREAD_READY) {
-      model->check_current_action();
-      model->scheduler->add_thread(curr);
-    } else if (curr->get_state() == THREAD_RUNNING)
-      /* Stopped while running; i.e., completed */
-      curr->complete();
-    else
-      ASSERT(false);
-  }
-  next = model->scheduler->next_thread();
-  if (next)
-    next->set_state(THREAD_RUNNING);
-  DEBUG("(%d, %d)\n", curr ? curr->get_id() : -1, next ? next->get_id() : -1);
-  if (!next)
-    return 1;
-  return Thread::swap(model->get_system_context(), next);
+static void param_defaults(struct model_params * params) {
+	params->maxreads = 0;
 }
 
-static void thread_wait_finish(void) {
-  DBG();
-
-  while (!thread_system_next());
+static void print_usage() {
+	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 while other writes exist\n"
+"--                    Program arguments follow.\n\n");
+	exit(EXIT_SUCCESS);
 }
 
-void real_main() {
-  thrd_t user_thread;
-  ucontext_t main_context;
-
-  //Create the singleton snapshotStack object
-  snapshotObject = new snapshotStack();
-  
-  model = new ModelChecker();
-  
-  if (getcontext(&main_context))
-    return;
-  
-  model->set_system_context(&main_context);
-
-  do {
-    /* Start user program */
-    model->add_thread(new Thread(&user_thread, &user_main, NULL));
-    
-    /* Wait for all threads to complete */
-    thread_wait_finish();
-  } while (model->next_execution());
-  
-  delete model;
-  
-  DEBUG("Exiting\n");
+static void parse_options(struct model_params *params, int *argc, char ***argv) {
+	const char *shortopts = "hm:";
+	int opt;
+	bool error = false;
+	while (!error && (opt = getopt(*argc, *argv, shortopts)) != -1) {
+		switch (opt) {
+		case 'h':
+			print_usage();
+			break;
+		case 'm':
+			params->maxreads = atoi(optarg);
+			break;
+		default: /* '?' */
+			error = true;
+			break;
+		}
+	}
+	(*argc) -= optind;
+	(*argv) += optind;
+
+	if (error)
+		print_usage();
 }
 
-int main_numargs;
-char ** main_args;
+int main_argc;
+char **main_argv;
+
+/** The real_main function contains the main model checking loop. */
+static void real_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, (void (*)(void *)) &user_main, NULL));
+
+		/* Wait for all threads to complete */
+		model->finish_execution();
+	} while (model->next_execution());
+
+	delete model;
+
+	DEBUG("Exiting\n");
+}
 
-/*
- * Main system function
+/**
+ * Main function.  Just initializes snapshotting library and the
+ * snapshotting library calls the real_main function.
  */
-int main(int numargs, char ** args) {
-  /* Stash this stuff in case someone wants it eventually */
-  main_numargs=numargs;
-  main_args=args;
+int main(int argc, char ** argv) {
+	main_argc = argc;
+	main_argv = argv;
 
-  /* Let's jump in quickly and start running stuff */
-  initSnapShotLibrary(10000 /*int numbackingpages*/, 1024 /*unsigned int numsnapshots*/, 1024 /*unsigned int nummemoryregions*/ , 1000 /*int numheappages*/, &real_main /*MyFuncPtr entryPoint*/);
+	/* Let's jump in quickly and start running stuff */
+	initSnapShotLibrary(10000, 1024, 1024, 1000, &real_main);
 }