projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
cyclegraph: memory "leak", fixup
[c11tester.git]
/
cyclegraph.h
diff --git
a/cyclegraph.h
b/cyclegraph.h
index e96e1216c0907a0af9d7e166441f960c5b782188..25401d9a3d349d07f6c4b11fe4a140e041f82394 100644
(file)
--- a/
cyclegraph.h
+++ b/
cyclegraph.h
@@
-9,9
+9,11
@@
#ifndef __CYCLEGRAPH_H__
#define __CYCLEGRAPH_H__
#ifndef __CYCLEGRAPH_H__
#define __CYCLEGRAPH_H__
-#include "hashtable.h"
#include <vector>
#include <inttypes.h>
#include <vector>
#include <inttypes.h>
+#include <stdio.h>
+
+#include "hashtable.h"
#include "config.h"
#include "mymemory.h"
#include "config.h"
#include "mymemory.h"
@@
-36,8
+38,8
@@
class CycleGraph {
bool checkForCycles() const;
bool checkPromise(const ModelAction *from, Promise *p) const;
bool checkForCycles() const;
bool checkPromise(const ModelAction *from, Promise *p) const;
- template <typename T>
- bool checkReachable(const
ModelAction *from, const T
*to) const;
+ template <typename T
, typename U
>
+ bool checkReachable(const
T *from, const U
*to) const;
void startChanges();
void commitChanges();
void startChanges();
void commitChanges();
@@
-45,10
+47,13
@@
class CycleGraph {
#if SUPPORT_MOD_ORDER_DUMP
void dumpNodes(FILE *file) const;
void dumpGraphToFile(const char *filename) const;
#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(ModelAction *reader, ModelAction *writer,
- promise_list_t *mustResolve);
+ bool resolvePromise(const Promise *promise, ModelAction *writer);
SNAPSHOTALLOC
private:
SNAPSHOTALLOC
private:
@@
-60,19
+65,19
@@
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;
+ std::vector< const CycleNode *, ModelAlloc<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::vector<
CycleNode *
> nodeList;
+ std::vector<
CycleNode *, SnapshotAlloc<CycleNode *>
> nodeList;
#endif
bool checkReachable(const CycleNode *from, const CycleNode *to) const;
#endif
bool checkReachable(const CycleNode *from, const CycleNode *to) const;