projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix RMW bug
[c11tester.git]
/
cyclegraph.h
diff --git
a/cyclegraph.h
b/cyclegraph.h
index 4a3d083d13c19fb897a29ebe2917af04f0990423..556af1cfdd04627c8b9a5d70d05c3078b01c3469 100644
(file)
--- a/
cyclegraph.h
+++ b/
cyclegraph.h
@@
-9,15
+9,14
@@
#ifndef __CYCLEGRAPH_H__
#define __CYCLEGRAPH_H__
#ifndef __CYCLEGRAPH_H__
#define __CYCLEGRAPH_H__
-#include "hashtable.h"
-#include <vector>
#include <inttypes.h>
#include <inttypes.h>
+#include <stdio.h>
+
+#include "hashtable.h"
#include "config.h"
#include "mymemory.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 {
/** @brief A graph of Model Actions for tracking cycles. */
class CycleGraph {
@@
-26,57
+25,64
@@
class CycleGraph {
~CycleGraph();
template <typename T, typename U>
~CycleGraph();
template <typename T, typename U>
- void addEdge(const T from, const U to);
+ bool addEdge(const T *from, const U *to);
+
+ template <typename T>
+ void addRMWEdge(const T *from, const ModelAction *rmw);
bool checkForCycles() const;
bool checkForCycles() const;
- void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
- bool checkPromise(const ModelAction *from, Promise *p) const;
- bool checkReachable(const ModelAction *from, const ModelAction *to) const;
+
+ template <typename T, typename U>
+ bool checkReachable(const T *from, const U *to) const;
+
void startChanges();
void commitChanges();
void rollbackChanges();
#if SUPPORT_MOD_ORDER_DUMP
void dumpNodes(FILE *file) const;
void dumpGraphToFile(const char *filename) const;
void startChanges();
void commitChanges();
void rollbackChanges();
#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
#endif
+ CycleNode * getNode_noCreate(const ModelAction *act) const;
SNAPSHOTALLOC
private:
SNAPSHOTALLOC
private:
-
void
addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
+
bool
addNodeEdge(CycleNode *fromnode, CycleNode *tonode);
void putNode(const ModelAction *act, CycleNode *node);
void putNode(const ModelAction *act, CycleNode *node);
- CycleNode * getNode(const ModelAction *);
-
CycleNode * getNode(const Promise *promise
);
+ CycleNode * getNode(const ModelAction *
act
);
+
bool mergeNodes(CycleNode *node1, CycleNode *node2
);
HashTable<const CycleNode *, const CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> *discovered;
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 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;
#if SUPPORT_MOD_ORDER_DUMP
#if SUPPORT_MOD_ORDER_DUMP
-
std::v
ector<CycleNode *> nodeList;
+
SnapV
ector<CycleNode *> nodeList;
#endif
bool checkReachable(const CycleNode *from, const CycleNode *to) const;
/** @brief A flag: true if this graph contains cycles */
bool hasCycles;
#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;
bool oldCycles;
-
std::vector< CycleNode *, SnapshotAlloc<CycleNode *>
> rollbackvector;
-
std::vector< CycleNode *, SnapshotAlloc<CycleNode *>
> rmwrollbackvector;
+
SnapVector<CycleNode *
> rollbackvector;
+
SnapVector<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);
*/
class CycleNode {
public:
CycleNode(const ModelAction *act);
- CycleNode(const Promise *promise);
bool addEdge(CycleNode *node);
CycleNode * getEdge(unsigned int i) const;
unsigned int getNumEdges() const;
bool addEdge(CycleNode *node);
CycleNode * getEdge(unsigned int i) const;
unsigned int getNumEdges() const;
@@
-90,26
+96,16
@@
class CycleNode {
void clearRMW() { hasRMW = NULL; }
const ModelAction * getAction() const { return action; }
void clearRMW() { hasRMW = NULL; }
const ModelAction * getAction() const { return action; }
- void popEdge() {
- edges.pop_back();
- }
-
- bool is_promise() const { return !action; }
-
SNAPSHOTALLOC
private:
/** @brief The ModelAction that this node represents */
const ModelAction *action;
SNAPSHOTALLOC
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;
-
/** @brief The edges leading out from this node */
/** @brief The edges leading out from this node */
-
std::vector< CycleNode *, SnapshotAlloc<CycleNode *>
> edges;
+
SnapVector<CycleNode *
> edges;
/** @brief The edges leading into this node */
/** @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 */
/** Pointer to a RMW node that reads from this node, or NULL, if none
* exists */