#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"
+#include "stl-model.h"
class Promise;
class CycleNode;
class ModelAction;
-typedef std::vector< const Promise *, ModelAlloc<const Promise *> > promise_list_t;
-
/** @brief A graph of Model Actions for tracking cycles. */
class CycleGraph {
public:
bool checkForCycles() const;
bool checkPromise(const ModelAction *from, Promise *p) const;
- template <typename T>
- bool checkReachable(const ModelAction *from, const T *to) const;
+ template <typename T, typename U>
+ bool checkReachable(const T *from, const U *to) const;
void startChanges();
void commitChanges();
#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);
+ template <typename T, typename U>
+ void dot_print_edge(FILE *file, const T *from, const U *to, const char *prop);
#endif
- bool resolvePromise(ModelAction *reader, ModelAction *writer,
- promise_list_t *mustResolve);
+ bool resolvePromise(const Promise *promise, ModelAction *writer);
SNAPSHOTALLOC
private:
bool addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
void putNode(const ModelAction *act, CycleNode *node);
+ void putNode(const Promise *promise, CycleNode *node);
+ void erasePromiseNode(const Promise *promise);
CycleNode * getNode(const ModelAction *act);
CycleNode * getNode(const Promise *promise);
CycleNode * getNode_noCreate(const ModelAction *act) const;
CycleNode * getNode_noCreate(const Promise *promise) const;
- bool mergeNodes(CycleNode *node1, CycleNode *node2,
- promise_list_t *mustMerge);
+ bool mergeNodes(CycleNode *node1, CycleNode *node2);
HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
+ ModelVector<const CycleNode *> * queue;
+
/** @brief A table for mapping ModelActions to CycleNodes */
HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> actionToNode;
- /** @brief A table for mapping reader ModelActions to Promise
- * CycleNodes */
- HashTable<const ModelAction *, CycleNode *, uintptr_t, 4> readerToPromiseNode;
+ /** @brief A table for mapping Promises to CycleNodes */
+ HashTable<const Promise *, CycleNode *, uintptr_t, 4> promiseToNode;
#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;
+ /** @brief The previous value of CycleGraph::hasCycles, for rollback */
bool oldCycles;
- std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rollbackvector;
- std::vector< CycleNode *, SnapshotAlloc<CycleNode *> > rmwrollbackvector;
+ SnapVector<CycleNode *> rollbackvector;
+ SnapVector<CycleNode *> rmwrollbackvector;
};
/**
const Promise *promise;
/** @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;
+ SnapVector<CycleNode *> back_edges;
/** Pointer to a RMW node that reads from this node, or NULL, if none
* exists */