X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=cyclegraph.h;h=6b3d93e5e45ec661d3acd4db987796b9b1adaea6;hb=2d685f1dc9ae1f1ace850737196e6e40d2f9e326;hp=0a6f7382a69cf78dae9b4d2bf995864b599b3912;hpb=fc32611957cecd106751b62bc4de4aeddc9af56c;p=model-checker.git

diff --git a/cyclegraph.h b/cyclegraph.h
index 0a6f738..6b3d93e 100644
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -1,9 +1,13 @@
-/** @file cyclegraph.h @brief Data structure to track ordering
- *  constraints on modification order.  The idea is to see whether a
- *  total order exists that satisfies the ordering constriants.*/
+/**
+ * @file cyclegraph.h
+ * @brief Data structure to track ordering constraints on modification order
+ *
+ * Used to determine whether a total order exists that satisfies the ordering
+ * constraints.
+ */
 
-#ifndef CYCLEGRAPH_H
-#define CYCLEGRAPH_H
+#ifndef __CYCLEGRAPH_H__
+#define __CYCLEGRAPH_H__
 
 #include "hashtable.h"
 #include <vector>
@@ -21,21 +25,22 @@ class CycleGraph {
 	CycleGraph();
 	~CycleGraph();
 	void addEdge(const ModelAction *from, const ModelAction *to);
-	bool checkForCycles();
-	bool checkForRMWViolation();
+	bool checkForCycles() const;
+	bool checkForRMWViolation() const;
 	void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
-	bool checkPromise(const ModelAction *from, Promise *p);
-	bool checkReachable(const ModelAction *from, const ModelAction *to);
+	bool checkPromise(const ModelAction *from, Promise *p) const;
+	bool checkReachable(const ModelAction *from, const ModelAction *to) const;
 	void startChanges();
 	void commitChanges();
 	void rollbackChanges();
 #if SUPPORT_MOD_ORDER_DUMP
-	void dumpNodes(FILE *file);
-	void dumpGraphToFile(const char *filename);
+	void dumpNodes(FILE *file) const;
+	void dumpGraphToFile(const char *filename) const;
 #endif
 
 	SNAPSHOTALLOC
  private:
+	void putNode(const ModelAction *act, CycleNode *node);
 	CycleNode * getNode(const ModelAction *);
 	HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
 
@@ -45,7 +50,7 @@ class CycleGraph {
 	std::vector<CycleNode *> nodeList;
 #endif
 
-	bool checkReachable(CycleNode *from, CycleNode *to);
+	bool checkReachable(CycleNode *from, CycleNode *to) const;
 
 	/** @brief A flag: true if this graph contains cycles */
 	bool hasCycles;
@@ -61,7 +66,7 @@ class CycleGraph {
 /** @brief A node within a CycleGraph; corresponds to one ModelAction */
 class CycleNode {
  public:
-	CycleNode(const ModelAction *action);
+	CycleNode(const ModelAction *act);
 	bool addEdge(CycleNode *node);
 	CycleNode * getEdge(unsigned int i) const;
 	unsigned int getNumEdges() const;
@@ -89,4 +94,4 @@ class CycleNode {
 	CycleNode *hasRMW;
 };
 
-#endif
+#endif /* __CYCLEGRAPH_H__ */