X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.cc;h=c364df9f7613178e2453d05bd667f64f44ed4fde;hb=f297a4e3dc814290c43671fea54a85c7a1a2aeee;hp=378dd8f4eebf3a5636a6203edd4eb4f381252343;hpb=c7f10b7c489c0c186bfe34dd1d87ae8b89d501ff;p=model-checker.git

diff --git a/nodestack.cc b/nodestack.cc
index 378dd8f..c364df9 100644
--- a/nodestack.cc
+++ b/nodestack.cc
@@ -77,7 +77,7 @@ Node::~Node()
 	if (action)
 		delete action;
 	if (enabled_array)
-		MYFREE(enabled_array);
+		model_free(enabled_array);
 }
 
 /** Prints debugging info for the ModelAction associated with this Node */
@@ -121,6 +121,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;
@@ -156,7 +158,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;
 			}
 		}
@@ -176,7 +178,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()));
 }
 
 /**
@@ -216,7 +218,7 @@ bool Node::read_from_empty() {
 void Node::explore_child(ModelAction *act, bool * is_enabled)
 {
 	if ( ! enabled_array )
-		enabled_array=(bool *)MYMALLOC(sizeof(bool)*num_threads);
+		enabled_array=(bool *)model_malloc(sizeof(bool)*num_threads);
 	if (is_enabled != NULL)
 		memcpy(enabled_array, is_enabled, sizeof(bool)*num_threads);
 	else {
@@ -286,12 +288,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;
 }
 
@@ -321,8 +323,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;
 }
 
 /**
@@ -330,8 +337,13 @@ 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;
 }
 
 void Node::explore(thread_id_t tid)