X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=inline;f=main.cc;h=73b3b0c410d95fbdbd06190eadd35b25b1288e77;hb=5e3720f6a6dccf2af670e4ab30660130f2a57c8f;hp=e629f6092992ce8fb59a80a7e14388b7b7724143;hpb=6a3cefc5fc5bcae7b7f94dd9e6199f6b3efdd76e;p=model-checker.git

diff --git a/main.cc b/main.cc
index e629f60..73b3b0c 100644
--- a/main.cc
+++ b/main.cc
@@ -1,82 +1,100 @@
+/** @file main.cc
+ *  @brief Entry point for the model checker.
+ */
+
 #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
+/**
+ * The thread_system_next function takes the next step in the execution.
+ * @return Returns the 1 if there is another step and 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);
+	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 (!model->isfeasible())
+		return 1;
+	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);
 }
 
+/** The thread_wait_finish method runs the current execution until we
+ *  have no more steps to take.
+ */
 static void thread_wait_finish(void) {
-  DBG();
+	DBG();
 
-  while (!thread_system_next());
+	while (!thread_system_next());
 }
 
-void real_main() {
-  thrd_t user_thread;
-  ucontext_t main_context;
-  
-  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");
+
+/** The real_main function contains the main model checking loop. */
+static void real_main() {
+	thrd_t user_thread;
+	ucontext_t main_context;
+
+	//Initialize race detector
+	initRaceDetector();
+
+	//Create the singleton SnapshotStack object
+	snapshotObject = new SnapshotStack();
+
+	model = new ModelChecker();
+
+	if (getcontext(&main_context))
+		return;
+
+	model->set_system_context(&main_context);
+
+	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 */
+		thread_wait_finish();
+	} while (model->next_execution());
+
+	delete model;
+
+	DEBUG("Exiting\n");
 }
 
 int main_numargs;
 char ** main_args;
 
-/*
- * 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;
+	/* Stash this stuff in case someone wants it eventually */
+	main_numargs=numargs;
+	main_args=args;
 
-  /* Let's jump in quickly and start running stuff */
-  initSnapShotLibrary(10000 /*int numbackingpages*/, 1024 /*unsigned int numsnapshots*/, 1024 /*unsigned int nummemoryregions*/ , &real_main /*MyFuncPtr entryPoint*/);
+	/* Let's jump in quickly and start running stuff */
+	initSnapShotLibrary(10000, 1024, 1024, 1000, &real_main);
 }