X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=23efa8f77566d10752f5d4f7e8c6c70f73aff55d;hb=d21164220a0d87ae931bf50d0e97ebf838742659;hp=37417d644a14d40c3f5f6fa51dc1e883ca3d437c;hpb=2b493dff916099b11e559243b117ffd5eabe8f3b;p=model-checker.git

diff --git a/model.cc b/model.cc
index 37417d6..23efa8f 100644
--- a/model.cc
+++ b/model.cc
@@ -2,6 +2,7 @@
 #include <algorithm>
 #include <mutex>
 #include <new>
+#include <stdarg.h>
 
 #include "model.h"
 #include "action.h"
@@ -15,6 +16,7 @@
 #include "datarace.h"
 #include "threads-model.h"
 #include "output.h"
+#include "traceanalysis.h"
 
 #define INITIAL_THREAD_ID	0
 
@@ -91,6 +93,7 @@ ModelChecker::ModelChecker(struct model_params params) :
 	thrd_last_action(new SnapVector<ModelAction *>(1)),
 	thrd_last_fence_release(new SnapVector<ModelAction *>()),
 	node_stack(new NodeStack()),
+	trace_analyses(new ModelVector<Trace_Analysis *>()),
 	priv(new struct model_snapshot_members()),
 	mo_graph(new CycleGraph())
 {
@@ -120,6 +123,9 @@ ModelChecker::~ModelChecker()
 	delete thrd_last_action;
 	delete thrd_last_fence_release;
 	delete node_stack;
+	for (unsigned int i = 0; i <trace_analyses->size();i++)
+		delete (*trace_analyses)[i];
+	delete trace_analyses;
 	delete scheduler;
 	delete mo_graph;
 	delete priv;
@@ -145,6 +151,18 @@ static SnapVector<action_list_t> * get_safe_ptr_vect_action(HashTable<void *, Sn
 	return tmp;
 }
 
+action_list_t * ModelChecker::get_actions_on_obj(void * obj, thread_id_t tid) {
+	SnapVector<action_list_t> *wrv=obj_thrd_map->get(obj);
+	if (wrv==NULL)
+		return NULL;
+	unsigned int thread=id_to_int(tid);
+	if (thread < wrv->size())
+		return &(*wrv)[thread];
+	else
+		return NULL;
+}
+
+
 /**
  * Restores user program to initial state and resets all model-checker data
  * structures.
@@ -419,9 +437,16 @@ bool ModelChecker::is_complete_execution() const
  * @param msg Descriptive message for the bug (do not include newline char)
  * @return True if bug is immediately-feasible
  */
-bool ModelChecker::assert_bug(const char *msg)
+bool ModelChecker::assert_bug(const char *msg, ...)
 {
-	priv->bugs.push_back(new bug_message(msg));
+	char str[800];
+
+	va_list ap;
+	va_start(ap, msg);
+	vsnprintf(str, sizeof(str), msg, ap);
+	va_end(ap);
+
+	priv->bugs.push_back(new bug_message(str));
 
 	if (isfeasibleprefix()) {
 		set_assert();
@@ -545,6 +570,7 @@ bool ModelChecker::next_execution()
 			assert_bug("Deadlock detected");
 
 		checkDataRaces();
+		run_trace_analyses();
 	}
 
 	record_stats();
@@ -570,6 +596,15 @@ bool ModelChecker::next_execution()
 	return true;
 }
 
+/**
+ * @brief Run trace analyses on complete trace. */
+
+void ModelChecker::run_trace_analyses() {
+	for(unsigned int i=0; i < trace_analyses->size(); i++) {
+		(*trace_analyses)[i]->analyze(action_trace);
+	}
+}
+
 /**
  * @brief Find the last fence-related backtracking conflict for a ModelAction
  *
@@ -1492,8 +1527,6 @@ ModelAction * ModelChecker::check_current_action(ModelAction *curr)
 	bool newly_explored = initialize_curr_action(&curr);
 
 	DBG();
-	if (DBG_ENABLED())
-		curr->print();
 
 	wake_up_sleeping_actions(curr);
 
@@ -1790,16 +1823,15 @@ bool ModelChecker::check_recency(ModelAction *curr, const T *rf) const
 }
 
 /**
- * Updates the mo_graph with the constraints imposed from the current
+ * @brief Updates the mo_graph with the constraints imposed from the current
  * read.
  *
  * Basic idea is the following: Go through each other thread and find
  * the last action that happened before our read.  Two cases:
  *
- * (1) The action is a write => that write must either occur before
+ * -# The action is a write: that write must either occur before
  * the write we read from or be the write we read from.
- *
- * (2) The action is a read => the write that that action read from
+ * -# The action is a read: the write that that action read from
  * must occur before the write we read from or be the same write.
  *
  * @param curr The current action. Must be a read.
@@ -3068,23 +3100,14 @@ Thread * ModelChecker::take_step(ModelAction *curr)
 	Thread *curr_thrd = get_thread(curr);
 	ASSERT(curr_thrd->get_state() == THREAD_READY);
 
-	if (!check_action_enabled(curr)) {
-		/* Make the execution look like we chose to run this action
-		 * much later, when a lock/join can succeed */
-		get_thread(curr)->set_pending(curr);
-		scheduler->sleep(curr_thrd);
-		curr = NULL;
-	} else {
-		curr = check_current_action(curr);
-		ASSERT(curr);
-	}
+	ASSERT(check_action_enabled(curr)); /* May have side effects? */
+	curr = check_current_action(curr);
+	ASSERT(curr);
 
 	if (curr_thrd->is_blocked() || curr_thrd->is_complete())
 		scheduler->remove_thread(curr_thrd);
 
-	if (curr)
-		return action_select_next_thread(curr);
-	return NULL;
+	return action_select_next_thread(curr);
 }
 
 /** Wrapper to run the user's main function, with appropriate arguments */
@@ -3129,7 +3152,16 @@ void ModelChecker::run()
 				if (!thr->is_model_thread() && !thr->is_complete() && !thr->get_pending()) {
 					switch_from_master(thr);
 					if (thr->is_waiting_on(thr))
-						assert_bug("Deadlock detected");
+						assert_bug("Deadlock detected (thread %u)", i);
+				}
+			}
+
+			/* Don't schedule threads which should be disabled */
+			for (unsigned int i = 0; i < get_num_threads(); i++) {
+				Thread *th = get_thread(int_to_id(i));
+				ModelAction *act = th->get_pending();
+				if (act && is_enabled(th) && !check_action_enabled(act)) {
+					scheduler->sleep(th);
 				}
 			}