projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
optimize hashtable so we don't always build new ones for cyclegraph check
[model-checker.git]
/
cyclegraph.h
diff --git
a/cyclegraph.h
b/cyclegraph.h
index 81d736962dcb6893c8ef213b9571454c24ac5ea6..f0f04ffee0c3ca1f9cd3ef2edf46c2743e6c0515 100644
(file)
--- a/
cyclegraph.h
+++ b/
cyclegraph.h
@@
-8,9
+8,10
@@
#include "hashtable.h"
#include <vector>
#include <inttypes.h>
#include "hashtable.h"
#include <vector>
#include <inttypes.h>
-
+#include "config.h"
#include "mymemory.h"
#include "mymemory.h"
+class Promise;
class CycleNode;
class ModelAction;
class CycleNode;
class ModelAction;
@@
-23,18
+24,26
@@
class CycleGraph {
bool checkForCycles();
bool checkForRMWViolation();
void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
bool checkForCycles();
bool checkForRMWViolation();
void addRMWEdge(const ModelAction *from, const ModelAction *rmw);
-
+ bool checkPromise(const ModelAction *from, Promise *p);
bool checkReachable(const ModelAction *from, const ModelAction *to);
void startChanges();
void commitChanges();
void rollbackChanges();
bool checkReachable(const ModelAction *from, const ModelAction *to);
void startChanges();
void commitChanges();
void rollbackChanges();
+#if SUPPORT_MOD_ORDER_DUMP
+ void dumpNodes(FILE *file);
+ void dumpGraphToFile(const char * filename);
+#endif
SNAPSHOTALLOC
private:
CycleNode * getNode(const ModelAction *);
SNAPSHOTALLOC
private:
CycleNode * getNode(const ModelAction *);
+ HashTable<CycleNode *, CycleNode *, uintptr_t, 4, model_malloc, model_calloc, model_free> * discovered;
/** @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;
+#if SUPPORT_MOD_ORDER_DUMP
+ std::vector<CycleNode *> nodeList;
+#endif
bool checkReachable(CycleNode *from, CycleNode *to);
bool checkReachable(CycleNode *from, CycleNode *to);
@@
-53,10
+62,12
@@
class CycleGraph {
class CycleNode {
public:
CycleNode(const ModelAction *action);
class CycleNode {
public:
CycleNode(const ModelAction *action);
-
void
addEdge(CycleNode * node);
+
bool
addEdge(CycleNode * node);
std::vector<CycleNode *> * getEdges();
bool setRMW(CycleNode *);
CycleNode* getRMW();
std::vector<CycleNode *> * getEdges();
bool setRMW(CycleNode *);
CycleNode* getRMW();
+ const ModelAction * getAction() {return action;};
+
void popEdge() {
edges.pop_back();
};
void popEdge() {
edges.pop_back();
};