projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hashtable: update documentation
[model-checker.git]
/
cyclegraph.h
diff --git
a/cyclegraph.h
b/cyclegraph.h
index e7e9380bb7e67e195d3d2ab95b587a44aa0234aa..7e7d180e0c1bd7a73de4653b657896f5a1df3a29 100644
(file)
--- a/
cyclegraph.h
+++ b/
cyclegraph.h
@@
-9,11
+9,13
@@
#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"
+#include "stl-model.h"
class Promise;
class CycleNode;
class Promise;
class CycleNode;
@@
-26,47
+28,65
@@
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 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
+ bool resolvePromise(const Promise *promise, ModelAction *writer);
+
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 *);
+ void putNode(const Promise *promise, CycleNode *node);
+ void erasePromiseNode(const Promise *promise);
+ CycleNode * getNode(const ModelAction *act);
CycleNode * getNode(const Promise *promise);
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);
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;
+ /** @brief A table for mapping Promises to CycleNodes */
+ HashTable<const Promise *, CycleNode *, uintptr_t, 4> promiseToNode;
#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;
};
/**
};
/**
@@
-90,11
+110,6
@@
class CycleNode {
void clearRMW() { hasRMW = NULL; }
const ModelAction * getAction() const { return action; }
const Promise * getPromise() const { return promise; }
void clearRMW() { hasRMW = NULL; }
const ModelAction * getAction() const { return action; }
const Promise * getPromise() const { return promise; }
-
- void popEdge() {
- edges.pop_back();
- }
-
bool is_promise() const { return !action; }
void resolvePromise(const ModelAction *writer);
bool is_promise() const { return !action; }
void resolvePromise(const ModelAction *writer);
@@
-108,10
+123,10
@@
class CycleNode {
const Promise *promise;
/** @brief The edges leading out from this node */
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 */
/** @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 */