X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=cyclegraph.cc;h=ead70ae6b38c2c687ab34c30db9659d57b68e110;hb=dbb1bb205f35f076cf2d82ec443415d858b22e2f;hp=e1d5b3c50ef1a243eac7c2955e55d0b4a6b0e67d;hpb=8bfca9bf950597e9967e62e02f7a5048e6cf4896;p=model-checker.git

diff --git a/cyclegraph.cc b/cyclegraph.cc
index e1d5b3c..ead70ae 100644
--- a/cyclegraph.cc
+++ b/cyclegraph.cc
@@ -6,6 +6,7 @@
 
 /** Initializes a CycleGraph object. */
 CycleGraph::CycleGraph() :
+	discovered(new HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free>(16)),
 	hasCycles(false),
 	oldCycles(false),
 	hasRMWViolation(false),
@@ -125,13 +126,13 @@ void CycleGraph::addRMWEdge(const ModelAction *from, const ModelAction *rmw) {
 		// careful...avoid it..
 		hasCycles=checkReachable(rmwnode, fromnode);
 	}
-	if(fromnode->addEdge(rmwnode))
+	if (fromnode->addEdge(rmwnode))
 		rollbackvector.push_back(fromnode);
 }
 
 #if SUPPORT_MOD_ORDER_DUMP
 void CycleGraph::dumpNodes(FILE *file) {
-  for(unsigned int i=0;i<nodeList.size();i++) {
+	for (unsigned int i=0;i<nodeList.size();i++) {
 		CycleNode *cn=nodeList[i];
 		std::vector<CycleNode *> * edges=cn->getEdges();
 		const ModelAction *action=cn->getAction();
@@ -139,22 +140,22 @@ void CycleGraph::dumpNodes(FILE *file) {
 		if (cn->getRMW()!=NULL) {
 			fprintf(file, "N%u -> N%u[style=dotted];\n", action->get_seq_number(), cn->getRMW()->getAction()->get_seq_number());
 		}
-		for(unsigned int j=0;j<edges->size();j++) {
-		  CycleNode *dst=(*edges)[j];
+		for (unsigned int j=0;j<edges->size();j++) {
+			CycleNode *dst=(*edges)[j];
 			const ModelAction *dstaction=dst->getAction();
-      fprintf(file, "N%u -> N%u;\n", action->get_seq_number(), dstaction->get_seq_number());
-	  }
+			fprintf(file, "N%u -> N%u;\n", action->get_seq_number(), dstaction->get_seq_number());
+		}
 	}
 }
 
 void CycleGraph::dumpGraphToFile(const char *filename) {
 	char buffer[200];
-  sprintf(buffer, "%s.dot",filename);
-  FILE *file=fopen(buffer, "w");
-  fprintf(file, "digraph %s {\n",filename);
+	sprintf(buffer, "%s.dot",filename);
+	FILE *file=fopen(buffer, "w");
+	fprintf(file, "digraph %s {\n",filename);
 	dumpNodes(file);
-  fprintf(file,"}\n");
-  fclose(file);	
+	fprintf(file,"}\n");
+	fclose(file);	
 }
 #endif
 
@@ -182,10 +183,10 @@ bool CycleGraph::checkReachable(const ModelAction *from, const ModelAction *to)
  */
 bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
 	std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
-	HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> discovered(64);
+	discovered->reset();
 
 	queue.push_back(from);
-	discovered.put(from, from);
+	discovered->put(from, from);
 	while(!queue.empty()) {
 		CycleNode * node=queue.back();
 		queue.pop_back();
@@ -194,8 +195,8 @@ bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
 
 		for(unsigned int i=0;i<node->getEdges()->size();i++) {
 			CycleNode *next=(*node->getEdges())[i];
-			if (!discovered.contains(next)) {
-				discovered.put(next,next);
+			if (!discovered->contains(next)) {
+				discovered->put(next,next);
 				queue.push_back(next);
 			}
 		}
@@ -205,12 +206,12 @@ bool CycleGraph::checkReachable(CycleNode *from, CycleNode *to) {
 
 bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) {
 	std::vector<CycleNode *, ModelAlloc<CycleNode *> > queue;
-	HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> discovered(64);
+	discovered->reset();
 	CycleNode *from = actionToNode.get(fromact);
 
 
 	queue.push_back(from);
-	discovered.put(from, from);
+	discovered->put(from, from);
 	while(!queue.empty()) {
 		CycleNode * node=queue.back();
 		queue.pop_back();
@@ -221,8 +222,8 @@ bool CycleGraph::checkPromise(const ModelAction *fromact, Promise *promise) {
 
 		for(unsigned int i=0;i<node->getEdges()->size();i++) {
 			CycleNode *next=(*node->getEdges())[i];
-			if (!discovered.contains(next)) {
-				discovered.put(next,next);
+			if (!discovered->contains(next)) {
+				discovered->put(next,next);
 				queue.push_back(next);
 			}
 		}