projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
action: reword comments
[model-checker.git]
/
clockvector.h
diff --git
a/clockvector.h
b/clockvector.h
index b7d720688a1c6df4a9aad410e1eb4897b08d35ff..739a336e1adc6c81178686c10da60d411cd903b8 100644
(file)
--- a/
clockvector.h
+++ b/
clockvector.h
@@
-8,6
+8,7
@@
#include "threads.h"
#include "mymemory.h"
#include "threads.h"
#include "mymemory.h"
+typedef unsigned int modelclock_t;
/* Forward declaration */
class ModelAction;
/* Forward declaration */
class ModelAction;
@@
-15,15
+16,17
@@
class ClockVector {
public:
ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
~ClockVector();
public:
ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
~ClockVector();
- void merge(ClockVector *cv);
- bool synchronized_since(ModelAction *act) const;
+ void merge(const ClockVector *cv);
+ bool synchronized_since(const ModelAction *act) const;
+ bool has_synchronized_with(const ClockVector *cv) 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;