projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix mistake in promises may allow code... need to be even more aggressive about fv
[model-checker.git]
/
cyclegraph.h
diff --git
a/cyclegraph.h
b/cyclegraph.h
index a2cb93d7ca702217be5af879cbf0c2ba34f9a67e..a03ebca4bff1ca3a2fc950acbd33f043c49b2068 100644
(file)
--- a/
cyclegraph.h
+++ b/
cyclegraph.h
@@
-9,19
+9,19
@@
#ifndef __CYCLEGRAPH_H__
#define __CYCLEGRAPH_H__
#ifndef __CYCLEGRAPH_H__
#define __CYCLEGRAPH_H__
-#include <vector>
#include <inttypes.h>
#include <stdio.h>
#include "hashtable.h"
#include "config.h"
#include "mymemory.h"
#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;
class Promise;
class CycleNode;
class ModelAction;
-typedef
std::vector< const Promise *, ModelAlloc<const Promise *>
> promise_list_t;
+typedef
ModelVector<const Promise *
> promise_list_t;
/** @brief A graph of Model Actions for tracking cycles. */
class CycleGraph {
/** @brief A graph of Model Actions for tracking cycles. */
class CycleGraph {
@@
-53,8
+53,7
@@
class CycleGraph {
void dot_print_edge(FILE *file, const T *from, const U *to, const char *prop);
#endif
void dot_print_edge(FILE *file, const T *from, const U *to, const char *prop);
#endif
- bool resolvePromise(const Promise *promise, ModelAction *writer,
- promise_list_t *mustResolve);
+ bool resolvePromise(const Promise *promise, ModelAction *writer);
SNAPSHOTALLOC
private:
SNAPSHOTALLOC
private:
@@
-66,10
+65,11
@@
class CycleGraph {
CycleNode * getNode(const Promise *promise);
CycleNode * getNode_noCreate(const ModelAction *act) const;
CycleNode * getNode_noCreate(const Promise *promise) const;
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;
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;
@@
-77,7
+77,7
@@
class CycleGraph {
HashTable<const Promise *, CycleNode *, uintptr_t, 4> promiseToNode;
#if SUPPORT_MOD_ORDER_DUMP
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;
#endif
bool checkReachable(const CycleNode *from, const CycleNode *to) const;
@@
-86,8
+86,8
@@
class CycleGraph {
bool hasCycles;
bool oldCycles;
bool hasCycles;
bool oldCycles;
-
std::vector< CycleNode *, SnapshotAlloc<CycleNode *>
> rollbackvector;
-
std::vector< CycleNode *, SnapshotAlloc<CycleNode *>
> rmwrollbackvector;
+
SnapVector<CycleNode *
> rollbackvector;
+
SnapVector<CycleNode *
> rmwrollbackvector;
};
/**
};
/**
@@
-124,10
+124,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 */