projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
small changes
[c11tester.git]
/
clockvector.h
diff --git
a/clockvector.h
b/clockvector.h
index b7d720688a1c6df4a9aad410e1eb4897b08d35ff..1a36a39dc040838f2c37b8166a8faf9b9a6a80fd 100644
(file)
--- a/
clockvector.h
+++ b/
clockvector.h
@@
-5,28
+5,28
@@
#ifndef __CLOCKVECTOR_H__
#define __CLOCKVECTOR_H__
#ifndef __CLOCKVECTOR_H__
#define __CLOCKVECTOR_H__
-#include "threads.h"
#include "mymemory.h"
#include "mymemory.h"
-
-/* Forward declaration */
-class ModelAction;
+#include "modeltypes.h"
+#include "classlist.h"
class ClockVector {
public:
class ClockVector {
public:
- ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
+ ClockVector(ClockVector *parent = NULL,
const
ModelAction *act = NULL);
~ClockVector();
~ClockVector();
- void merge(ClockVector *cv);
- bool synchronized_since(ModelAction *act) const;
+ bool merge(const ClockVector *cv);
+ bool minmerge(const ClockVector *cv);
+ bool synchronized_since(const ModelAction *act) const;
void print() const;
void print() const;
+ modelclock_t getClock(thread_id_t thread);
-
MEM
ALLOC
+
SNAPSHOT
ALLOC
private:
/** @brief Holds the actual clock data, as an array. */
private:
/** @brief Holds the actual clock data, as an array. */
-
in
t *clock;
+
modelclock_
t *clock;
/** @brief The number of threads recorded in clock (i.e., its length). */
int num_threads;
};
/** @brief The number of threads recorded in clock (i.e., its length). */
int num_threads;
};
-#endif /* __CLOCKVECTOR_H__ */
+#endif /* __CLOCKVECTOR_H__ */