projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
action: add Thread parameter to constructor
[model-checker.git]
/
clockvector.h
diff --git
a/clockvector.h
b/clockvector.h
index 1428886c80f692891a8103be8e721bc07644cdf7..6a902c5215342bae0313d56b3e6cfa8267bd79cf 100644
(file)
--- a/
clockvector.h
+++ b/
clockvector.h
@@
-5,10
+5,9
@@
#ifndef __CLOCKVECTOR_H__
#define __CLOCKVECTOR_H__
#ifndef __CLOCKVECTOR_H__
#define __CLOCKVECTOR_H__
-#include "threads.h"
#include "mymemory.h"
#include "mymemory.h"
+#include "modeltypes.h"
-typedef unsigned int modelclock_t;
/* Forward declaration */
class ModelAction;
/* Forward declaration */
class ModelAction;
@@
-16,13
+15,14
@@
class ClockVector {
public:
ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
~ClockVector();
public:
ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL);
~ClockVector();
- void merge(ClockVector *cv);
+ void merge(
const
ClockVector *cv);
bool synchronized_since(const ModelAction *act) const;
bool synchronized_since(const ModelAction *act) const;
+ bool has_synchronized_with(const ClockVector *cv) const;
void print() const;
modelclock_t getClock(thread_id_t thread);
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;