small changes

[c11tester.git] / cyclegraph.h

diff --git a/cyclegraph.h b/cyclegraph.h
index 5c49992ea26b7dc99bc88cea4040e98c88cc3361..716e811d64ea6ea4153572d6d9c485762b0988ef 100644 (file)
--- a/cyclegraph.h
+++ b/cyclegraph.h
@@ -9,102 +9,88 @@
 #ifndef __CYCLEGRAPH_H__
 #define __CYCLEGRAPH_H__
 
-#include "hashtable.h"
-#include <vector>
 #include <inttypes.h>
+#include <stdio.h>
+
+#include "hashtable.h"
 #include "config.h"
 #include "mymemory.h"
-
-class Promise;
-class CycleNode;
-class ModelAction;
+#include "stl-model.h"
+#include "classlist.h"
 
 /** @brief A graph of Model Actions for tracking cycles. */
 class CycleGraph {
- public:
+public:
        CycleGraph();
        ~CycleGraph();
-       void addEdge(const ModelAction *from, const ModelAction *to);
-       bool checkForCycles() const;
-       void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
-       bool checkPromise(const ModelAction *from, Promise *p) const;
+       void addEdges(SnapList<ModelAction *> * edgeset, ModelAction *to);
+       void addEdge(ModelAction *from, ModelAction *to);
+       void addEdge(ModelAction *from, ModelAction *to, bool forceedge);
+       void addRMWEdge(ModelAction *from, ModelAction *rmw);
        bool checkReachable(const ModelAction *from, const ModelAction *to) const;
-       void startChanges();
-       void commitChanges();
-       void rollbackChanges();
+       void freeAction(const ModelAction * act);
 #if SUPPORT_MOD_ORDER_DUMP
        void dumpNodes(FILE *file) const;
        void dumpGraphToFile(const char *filename) const;
+       void dot_print_node(FILE *file, const ModelAction *act);
+       void dot_print_edge(FILE *file, const ModelAction *from, const ModelAction *to, const char *prop);
 #endif
 
+       CycleNode * getNode_noCreate(const ModelAction *act) const;
        SNAPSHOTALLOC
- private:
-       void addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+private:
+       void addNodeEdge(CycleNode *fromnode, CycleNode *tonode, bool forceedge);
        void putNode(const ModelAction *act, CycleNode *node);
-       CycleNode * getNode(const ModelAction *);
-       HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
+       CycleNode * getNode(ModelAction *act);
 
        /** @brief A table for mapping ModelActions to CycleNodes */
        HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
+       SnapVector<const CycleNode *> * queue;
+
 #if SUPPORT_MOD_ORDER_DUMP
-       std::vector<CycleNode *> nodeList;
+       SnapVector<CycleNode *> nodeList;
 #endif
 
        bool checkReachable(const CycleNode *from, const CycleNode *to) const;
-
-       /** @brief A flag: true if this graph contains cycles */
-       bool hasCycles;
-       bool oldCycles;
-
-       std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rollbackvector;
-       std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
 };
 
 /**
- * @brief A node within a CycleGraph; corresponds either to one ModelAction or
- * to a promised future value
+ * @brief A node within a CycleGraph; corresponds either to one ModelAction
  */
 class CycleNode {
- public:
-       CycleNode(const ModelAction *act);
-       CycleNode(const Promise *promise);
-       bool addEdge(CycleNode *node);
+public:
+       CycleNode(ModelAction *act);
+       void addEdge(CycleNode *node);
        CycleNode * getEdge(unsigned int i) const;
        unsigned int getNumEdges() const;
-       CycleNode * getBackEdge(unsigned int i) const;
-       unsigned int getNumBackEdges() const;
-       CycleNode * removeEdge();
-       CycleNode * removeBackEdge();
-
+       CycleNode * getInEdge(unsigned int i) const;
+       unsigned int getNumInEdges() const;
        bool setRMW(CycleNode *);
        CycleNode * getRMW() const;
        void clearRMW() { hasRMW = NULL; }
-       const ModelAction * getAction() const { return action; }
-
-       void popEdge() {
-               edges.pop_back();
-       }
-
-       bool is_promise() const { return !action; }
+       ModelAction * getAction() const { return action; }
+       void removeInEdge(CycleNode *src);
+       void removeEdge(CycleNode *dst);
+       ~CycleNode();
 
        SNAPSHOTALLOC
- private:
+private:
        /** @brief The ModelAction that this node represents */
-       const ModelAction *action;
-
-       /** @brief The promise represented by this node; only valid when action
-        * is NULL */
-       const Promise *promise;
+       ModelAction *action;
 
        /** @brief The edges leading out from this node */
-       std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > edges;
+       SnapVector<CycleNode *> edges;
 
-       /** @brief The edges leading into this node */
-       std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > back_edges;
+       /** @brief The edges leading in from this node */
+       SnapVector<CycleNode *> inedges;
 
        /** Pointer to a RMW node that reads from this node, or NULL, if none
         * exists */
        CycleNode *hasRMW;
+
+       /** ClockVector for this Node. */
+       ClockVector *cv;
+       friend class CycleGraph;
 };
 
-#endif /* __CYCLEGRAPH_H__ */
+#endif /* __CYCLEGRAPH_H__ */