X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=nodestack.cc;h=72c8d5cf5e46f7dca4241aa12f26958439ad15c3;hp=69f0b5f513640f5861c6c3bf117c73fc440c7da6;hb=8f379cb70822bfd5498da9997ad4f7c3b37a18ed;hpb=c451049894af068c8ba22011e3094e66a45d20c3

diff --git a/nodestack.cc b/nodestack.cc
index 69f0b5f..72c8d5c 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -1,7 +1,10 @@
+#include <string.h>
+
 #include "nodestack.h"
 #include "action.h"
 #include "common.h"
 #include "model.h"
+#include "threads.h"
 
 /**
  * @brief Node constructor
@@ -17,26 +20,58 @@
  * @param nthreads The number of threads which exist at this point in the
  * execution trace.
  */
-Node::Node(ModelAction *act, Node *par, int nthreads, bool *enabled)
+Node::Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness)
 	: action(act),
 	parent(par),
 	num_threads(nthreads),
 	explored_children(num_threads),
 	backtrack(num_threads),
+	fairness(num_threads),
 	numBacktracks(0),
+	enabled_array(NULL),
 	may_read_from(),
 	read_from_index(0),
 	future_values(),
-	future_index(-1)
+	future_index(-1),
+	relseq_break_writes(),
+	relseq_break_index(0)
 {
-	if (act)
+	if (act) {
 		act->set_node(this);
-	enabled_array=(bool *)MYMALLOC(sizeof(bool)*num_threads);
-	if (enabled)
-		memcpy(enabled_array, enabled, sizeof(bool)*num_threads);
-	else 
-		for(int i=0;i<num_threads;i++)
-			enabled_array[i]=false;
+		int currtid=id_to_int(act->get_tid());
+		int prevtid=(prevfairness != NULL)?id_to_int(prevfairness->action->get_tid()):0;
+		
+		if ( model->params.fairwindow != 0 ) {
+			for(int i=0;i<nthreads;i++) {
+				ASSERT(i<((int)fairness.size()));
+				struct fairness_info * fi=& fairness[i];
+				struct fairness_info * prevfi=(par!=NULL)&&(i<par->get_num_threads())?&par->fairness[i]:NULL;
+				if (prevfi) {
+					*fi=*prevfi;
+				}
+				if (parent->enabled_array[i]==THREAD_ENABLED) {
+					fi->enabled_count++;
+				}
+				if (i==currtid) {
+					fi->turns++;
+					fi->priority = false;
+				}
+				//Do window processing
+				if (prevfairness != NULL) {
+					if (prevfairness -> parent->enabled_array[i] == THREAD_ENABLED)
+						fi->enabled_count--;
+					if (i==prevtid) {
+						fi->turns--;
+					}
+					//Need full window to start evaluating conditions
+					//If we meet the enabled count and have no turns, give us priority
+					if ((fi->enabled_count >= model->params.enabledcount) &&
+							(fi->turns == 0))
+						fi->priority = true;
+				}
+			}
+		}
+	}
 }
 
 /** @brief Node desctructor */
@@ -44,7 +79,8 @@ Node::~Node()
 {
 	if (action)
 		delete action;
-	MYFREE(enabled_array);
+	if (enabled_array)
+		model_free(enabled_array);
 }
 
 /** Prints debugging info for the ModelAction associated with this Node */
@@ -88,6 +124,8 @@ bool Node::get_promise(unsigned int i) {
  * @return true if we have a valid combination.
  */
 bool Node::increment_promise() {
+	DBG();
+
 	for (unsigned int i = 0; i < promises.size(); i++) {
 		if (promises[i] == PROMISE_UNFULFILLED) {
 			promises[i] = PROMISE_FULFILLED;
@@ -123,7 +161,7 @@ bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
 		if (future_values[i].value == value) {
 			if (future_values[i].expiration>=expiration)
 				return false;
-			if (future_index < i) {
+			if (future_index < ((int) i)) {
 				suitableindex=i;
 			}
 		}
@@ -143,7 +181,7 @@ bool Node::add_future_value(uint64_t value, modelclock_t expiration) {
  * @return true if the future_values set is empty.
  */
 bool Node::future_value_empty() {
-	return ((future_index + 1) >= future_values.size());
+	return ((future_index + 1) >= ((int)future_values.size()));
 }
 
 /**
@@ -180,8 +218,17 @@ bool Node::read_from_empty() {
  * Mark the appropriate backtracking information for exploring a thread choice.
  * @param act The ModelAction to explore
  */
-void Node::explore_child(ModelAction *act)
+void Node::explore_child(ModelAction *act, enabled_type_t * is_enabled)
 {
+	if ( ! enabled_array )
+		enabled_array=(enabled_type_t *)model_malloc(sizeof(enabled_type_t)*num_threads);
+	if (is_enabled != NULL)
+		memcpy(enabled_array, is_enabled, sizeof(enabled_type_t)*num_threads);
+	else {
+		for(int i=0;i<num_threads;i++)
+			enabled_array[i]=THREAD_DISABLED;
+	}
+
 	explore(act->get_tid());
 }
 
@@ -220,7 +267,18 @@ thread_id_t Node::get_next_backtrack()
 bool Node::is_enabled(Thread *t)
 {
 	int thread_id=id_to_int(t->get_id());
-	return thread_id < num_threads && enabled_array[thread_id];
+	return thread_id < num_threads && (enabled_array[thread_id] == THREAD_ENABLED);
+}
+
+bool Node::is_enabled(thread_id_t tid)
+{
+	int thread_id=id_to_int(tid);
+	return thread_id < num_threads && (enabled_array[thread_id] == THREAD_ENABLED);
+}
+
+bool Node::has_priority(thread_id_t tid)
+{
+	return fairness[id_to_int(tid)].priority;
 }
 
 /**
@@ -238,12 +296,12 @@ void Node::add_read_from(const ModelAction *act)
  * @return The first element in future_values
  */
 uint64_t Node::get_future_value() {
-	ASSERT(future_index<future_values.size());
+	ASSERT(future_index<((int)future_values.size()));
 	return future_values[future_index].value;
 }
 
 modelclock_t Node::get_future_value_expiration() {
-	ASSERT(future_index<future_values.size());
+	ASSERT(future_index<((int)future_values.size()));
 	return future_values[future_index].expiration;
 }
 
@@ -273,8 +331,13 @@ const ModelAction * Node::get_read_from() {
  * @return Returns false if we have explored all items.
  */
 bool Node::increment_read_from() {
-	read_from_index++;
-	return (read_from_index < may_read_from.size());
+	DBG();
+	promises.clear();
+	if (read_from_index < may_read_from.size()) {
+		read_from_index++;
+		return read_from_index < may_read_from.size();
+	}
+	return false;
 }
 
 /**
@@ -282,8 +345,65 @@ bool Node::increment_read_from() {
  * @return Returns false if we have explored all values.
  */
 bool Node::increment_future_value() {
-	future_index++;
-	return (future_index < future_values.size());
+	DBG();
+	promises.clear();
+	if (future_index < ((int)future_values.size())) {
+		future_index++;
+		return (future_index < ((int)future_values.size()));
+	}
+	return false;
+}
+
+/**
+ * Add a write ModelAction to the set of writes that may break the release
+ * sequence. This is used during replay exploration of pending release
+ * sequences. This Node must correspond to a release sequence fixup action.
+ *
+ * @param write The write that may break the release sequence. NULL means we
+ * allow the release sequence to synchronize.
+ */
+void Node::add_relseq_break(const ModelAction *write)
+{
+	relseq_break_writes.push_back(write);
+}
+
+/**
+ * Get the write that may break the current pending release sequence,
+ * according to the replay / divergence pattern.
+ *
+ * @return A write that may break the release sequence. If NULL, that means
+ * the release sequence should not be broken.
+ */
+const ModelAction * Node::get_relseq_break()
+{
+	if (relseq_break_index < (int)relseq_break_writes.size())
+		return relseq_break_writes[relseq_break_index];
+	else
+		return NULL;
+}
+
+/**
+ * Increments the index into the relseq_break_writes set to explore the next
+ * item.
+ * @return Returns false if we have explored all values.
+ */
+bool Node::increment_relseq_break()
+{
+	DBG();
+	promises.clear();
+	if (relseq_break_index < ((int)relseq_break_writes.size())) {
+		relseq_break_index++;
+		return (relseq_break_index < ((int)relseq_break_writes.size()));
+	}
+	return false;
+}
+
+/**
+ * @return True if all writes that may break the release sequence have been
+ * explored
+ */
+bool Node::relseq_break_empty() {
+	return ((relseq_break_index + 1) >= ((int)relseq_break_writes.size()));
 }
 
 void Node::explore(thread_id_t tid)
@@ -296,58 +416,53 @@ void Node::explore(thread_id_t tid)
 	explored_children[i] = true;
 }
 
-static void clear_node_list(node_list_t *list, node_list_t::iterator start,
-                                               node_list_t::iterator end)
+NodeStack::NodeStack() :
+	node_list(1, new Node()),
+	iter(0),
+	total_nodes(0)
 {
-	node_list_t::iterator it;
-
-	for (it = start; it != end; it++)
-		delete (*it);
-	list->erase(start, end);
-}
-
-NodeStack::NodeStack()
-	: total_nodes(0)
-{
-	node_list.push_back(new Node());
 	total_nodes++;
-	iter = node_list.begin();
 }
 
 NodeStack::~NodeStack()
 {
-	clear_node_list(&node_list, node_list.begin(), node_list.end());
+	for (unsigned int i = 0; i < node_list.size(); i++)
+		delete node_list[i];
 }
 
 void NodeStack::print()
 {
-	node_list_t::iterator it;
 	printf("............................................\n");
 	printf("NodeStack printing node_list:\n");
-	for (it = node_list.begin(); it != node_list.end(); it++) {
+	for (unsigned int it = 0; it < node_list.size(); it++) {
 		if (it == this->iter)
 			printf("vvv following action is the current iterator vvv\n");
-		(*it)->print();
+		node_list[it]->print();
 	}
 	printf("............................................\n");
 }
 
-ModelAction * NodeStack::explore_action(ModelAction *act, bool * enabled)
+/** Note: The is_enabled set contains what actions were enabled when
+ *  act was chosen. */
+
+ModelAction * NodeStack::explore_action(ModelAction *act, enabled_type_t * is_enabled)
 {
 	DBG();
 
 	ASSERT(!node_list.empty());
-	node_list_t::iterator it=iter;
-	it++;
 
-	if (it != node_list.end()) {
+	if ((iter+1) < node_list.size()) {
 		iter++;
-		return (*iter)->get_action();
+		return node_list[iter]->get_action();
 	}
 
 	/* Record action */
-	get_head()->explore_child(act);
-	node_list.push_back(new Node(act, get_head(), model->get_num_threads(), enabled));
+	get_head()->explore_child(act, is_enabled);
+	Node *prevfairness = NULL;
+	if ( model->params.fairwindow != 0 && iter > model->params.fairwindow ) {
+		prevfairness = node_list[iter-model->params.fairwindow];
+	}
+	node_list.push_back(new Node(act, get_head(), model->get_num_threads(), prevfairness));
 	total_nodes++;
 	iter++;
 	return NULL;
@@ -364,35 +479,34 @@ ModelAction * NodeStack::explore_action(ModelAction *act, bool * enabled)
 void NodeStack::pop_restofstack(int numAhead)
 {
 	/* Diverging from previous execution; clear out remainder of list */
-	node_list_t::iterator it = iter;
-	while (numAhead--)
-		it++;
-	clear_node_list(&node_list, it, node_list.end());
+	unsigned int it=iter+numAhead;
+	for(unsigned int i=it;i<node_list.size();i++)
+		delete node_list[i];
+	node_list.resize(it);
 }
 
 Node * NodeStack::get_head()
 {
 	if (node_list.empty())
 		return NULL;
-	return *iter;
+	return node_list[iter];
 }
 
 Node * NodeStack::get_next()
 {
-	node_list_t::iterator it = iter;
 	if (node_list.empty()) {
 		DEBUG("Empty\n");
 		return NULL;
 	}
-	it++;
-	if (it == node_list.end()) {
+	unsigned int it=iter+1;
+	if (it == node_list.size()) {
 		DEBUG("At end\n");
 		return NULL;
 	}
-	return *it;
+	return node_list[it];
 }
 
 void NodeStack::reset_execution()
 {
-	iter = node_list.begin();
+	iter = 0;
 }