projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
model: wire up rest of release seq. resolution backtracking
[model-checker.git]
/
clockvector.h
diff --git
a/clockvector.h
b/clockvector.h
index 470914b1ae2b08b19248b5aba29142c990232b4f..6a902c5215342bae0313d56b3e6cfa8267bd79cf 100644
(file)
--- a/
clockvector.h
+++ b/
clockvector.h
@@
-5,8
+5,8
@@
#ifndef __CLOCKVECTOR_H__
#define __CLOCKVECTOR_H__
#ifndef __CLOCKVECTOR_H__
#define __CLOCKVECTOR_H__
-#include "threads.h"
#include "mymemory.h"
#include "mymemory.h"
+#include "modeltypes.h"
/* Forward declaration */
class ModelAction;
/* Forward declaration */
class ModelAction;
@@
-15,16
+15,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;
-
in
t getClock(thread_id_t thread);
+
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;