X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=waitobj.cc;h=dc422be7804e0a245130b1ff0b3a93c511931e75;hp=5a1bc12f1f3c68f0bda956fd2557c85a69e47fe9;hb=25d73096cfc14c655f94b01bb235cc5efd1d5696;hpb=f54c2d871c2482fd271ffb6969106e37eb6a9263

diff --git a/waitobj.cc b/waitobj.cc
index 5a1bc12f..dc422be7 100644
--- a/waitobj.cc
+++ b/waitobj.cc
@@ -2,6 +2,8 @@
 #include "threads-model.h"
 #include "funcnode.h"
 
+#define COUNTER_THRESHOLD 1000
+
 WaitObj::WaitObj(thread_id_t tid) :
 	tid(tid),
 	waiting_for(32),
@@ -13,10 +15,10 @@ WaitObj::WaitObj(thread_id_t tid) :
 
 WaitObj::~WaitObj()
 {
-	for (uint i = 0; i < thrd_dist_maps.size(); i++)
+	for (uint i = 0;i < thrd_dist_maps.size();i++)
 		delete thrd_dist_maps[i];
 
-	for (uint i = 0; i < thrd_target_nodes.size(); i++)
+	for (uint i = 0;i < thrd_target_nodes.size();i++)
 		delete thrd_target_nodes[i];
 }
 
@@ -54,7 +56,10 @@ bool WaitObj::remove_waiting_for_node(thread_id_t other, FuncNode * node)
 
 	/* The thread has no nodes to reach */
 	if (target_nodes->isEmpty()) {
+		int index = id_to_int(other);
+		thrd_action_counters[index] = 0;
 		waiting_for.remove(other);
+
 		return true;
 	}
 
@@ -64,11 +69,17 @@ bool WaitObj::remove_waiting_for_node(thread_id_t other, FuncNode * node)
 /* Stop waiting for the thread */
 void WaitObj::remove_waiting_for(thread_id_t other)
 {
-	// TODO: clear dist_map or not?
 	waiting_for.remove(other);
 
+	// TODO: clear dist_map or not?
+	/* dist_map_t * dist_map = getDistMap(other);
+	   dist_map->reset(); */
+
 	node_set_t * target_nodes = getTargetNodes(other);
 	target_nodes->reset();
+
+	int index = id_to_int(other);
+	thrd_action_counters[index] = 0;
 }
 
 void WaitObj::remove_waited_by(thread_id_t other)
@@ -96,7 +107,7 @@ dist_map_t * WaitObj::getDistMap(thread_id_t tid)
 
 	if (old_size <= thread_id) {
 		thrd_dist_maps.resize(thread_id + 1);
-		for (int i = old_size; i < thread_id + 1; i++) {
+		for (int i = old_size;i < thread_id + 1;i++) {
 			thrd_dist_maps[i] = new dist_map_t(16);
 		}
 	}
@@ -111,7 +122,7 @@ node_set_t * WaitObj::getTargetNodes(thread_id_t tid)
 
 	if (old_size <= thread_id) {
 		thrd_target_nodes.resize(thread_id + 1);
-		for (int i = old_size; i < thread_id + 1; i++) {
+		for (int i = old_size;i < thread_id + 1;i++) {
 			thrd_target_nodes[i] = new node_set_t(16);
 		}
 	}
@@ -119,24 +130,6 @@ node_set_t * WaitObj::getTargetNodes(thread_id_t tid)
 	return thrd_target_nodes[thread_id];
 }
 
-/*
-SnapVector<thread_id_t> WaitObj::incr_waiting_for_counter()
-{
-	SnapVector<thread_id_t> expire_thrds;
-
-	thrd_id_set_iter * iter = waiting_for.iterator();
-	while (iter->hasNext()) {
-		thread_id_t waiting_for_id = iter->next();
-		bool expire = incr_counter(waiting_for_id);
-
-		if (expire) {
-			expire_thrds.push_back(waiting_for_id);
-		}
-	}
-
-	return expire_thrds;
-}*/
-
 /**
  * Increment action counter for thread tid
  * @return true if the counter for tid expires
@@ -151,9 +144,10 @@ bool WaitObj::incr_counter(thread_id_t tid)
 	}
 
 	thrd_action_counters[thread_id]++;
-
-	if (thrd_action_counters[thread_id] > 1000)
+	if (thrd_action_counters[thread_id] > COUNTER_THRESHOLD) {
+		thrd_action_counters[thread_id] = 0;
 		return true;
+	}
 
 	return false;
 }
@@ -164,11 +158,18 @@ void WaitObj::clear_waiting_for()
 	while (iter->hasNext()) {
 		thread_id_t tid = iter->next();
 		int index = id_to_int(tid);
-		thrd_target_nodes[index]->reset();
+		thrd_action_counters[index] = 0;
+
 		/* thrd_dist_maps are not reset because distances
-		 * will be overwritten when node targets are added */
+		 * will be overwritten when node targets are added
+		 * thrd_dist_maps[index]->reset(); */
+
+		node_set_t * target_nodes = getTargetNodes(tid);
+		target_nodes->reset();
 	}
 
+	delete iter;
+
 	waiting_for.reset();
 	/* waited_by relation should be kept */
 }
@@ -186,11 +187,12 @@ void WaitObj::print_waiting_for(bool verbose)
 		model_print("%d ", waiting_for_id);
 	}
 	model_print("\n");
+	delete it;
 
 	if (verbose) {
 		/* Print out the distances from each thread to target nodes */
 		model_print("\t");
-		for (uint i = 0; i < thrd_target_nodes.size(); i++) {
+		for (uint i = 0;i < thrd_target_nodes.size();i++) {
 			dist_map_t * dist_map = getDistMap(i);
 			node_set_t * node_set = getTargetNodes(i);
 			node_set_iter * node_iter = node_set->iterator();
@@ -198,13 +200,15 @@ void WaitObj::print_waiting_for(bool verbose)
 			if (!node_set->isEmpty()) {
 				model_print("[thread %d](", int_to_id(i));
 
-				while (node_iter->hasNext()){
+				while (node_iter->hasNext()) {
 					FuncNode * node = node_iter->next();
 					int dist = dist_map->get(node);
 					model_print("node %d: %d, ", node->get_func_id(), dist);
 				}
 				model_print(") ");
 			}
+
+			delete node_iter;
 		}
 		model_print("\n");
 	}
@@ -223,4 +227,6 @@ void WaitObj::print_waited_by()
 		model_print("%d ", thread_id);
 	}
 	model_print("\n");
+
+	delete it;
 }