From: Brian Norris <banorris@uci.edu>
Date: Thu, 20 Sep 2012 23:33:37 +0000 (-0700)
Subject: Merge branch 'norris'
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=f05f7c754e5d8c7b1152ab2004761fc50a0596a8;hp=b8f97b8e63effbd3b3de6bbf51d79f9da76b4085

Merge branch 'norris'
---

diff --git a/model.cc b/model.cc
index eb646294..64c1daa5 100644
--- a/model.cc
+++ b/model.cc
@@ -243,6 +243,13 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act)
 	return NULL;
 }
 
+/** This method find backtracking points where we should try to
+ * reorder the parameter ModelAction against.
+ *
+ * @param the ModelAction to find backtracking points for.
+ */
+
+
 void ModelChecker::set_backtracking(ModelAction *act)
 {
 	Thread *t = get_thread(act);
@@ -1534,6 +1541,11 @@ void ModelChecker::add_thread(Thread *t)
 	scheduler->add_thread(t);
 }
 
+/**
+ * Removes a thread from the scheduler. 
+ * @param the thread to remove.
+ */
+
 void ModelChecker::remove_thread(Thread *t)
 {
 	scheduler->remove_thread(t);