projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add a data structure to store the values read by last read actions of each thread...
[c11tester.git]
/
clockvector.h
diff --git
a/clockvector.h
b/clockvector.h
index 56037eb6bfcd2f37a5110d12a7f733e79faad8b0..962e9ec4844995c811638030d5a7c11a983ea36e 100644
(file)
--- a/
clockvector.h
+++ b/
clockvector.h
@@
-5,24
+5,21
@@
#ifndef __CLOCKVECTOR_H__
#define __CLOCKVECTOR_H__
#ifndef __CLOCKVECTOR_H__
#define __CLOCKVECTOR_H__
-#include "threads.h"
#include "mymemory.h"
#include "mymemory.h"
-
-typedef unsigned int modelclock_t;
-/* 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(const ClockVector *cv);
+
bool
merge(const ClockVector *cv);
bool synchronized_since(const ModelAction *act) const;
void print() const;
modelclock_t getClock(thread_id_t thread);
bool synchronized_since(const ModelAction *act) 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. */
modelclock_t *clock;
private:
/** @brief Holds the actual clock data, as an array. */
modelclock_t *clock;
@@
-31,4
+28,4
@@
private:
int num_threads;
};
int num_threads;
};
-#endif /* __CLOCKVECTOR_H__ */
+#endif /* __CLOCKVECTOR_H__ */