#ifndef __CYCLEGRAPH_H__
#define __CYCLEGRAPH_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 mergeNodes(CycleNode *node1, CycleNode *node2);
HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
- std::vector< const CycleNode *, ModelAlloc<const CycleNode *> > * queue;
+ ModelVector<const CycleNode *> * queue;
/** @brief A table for mapping ModelActions to CycleNodes */
HashTable<const Promise *, CycleNode *, uintptr_t, 4> promiseToNode;
#if SUPPORT_MOD_ORDER_DUMP
- std::vector< CycleNode *, SnapshotAlloc<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 */