projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into mutex
[model-checker.git]
/
clockvector.cc
diff --git
a/clockvector.cc
b/clockvector.cc
index cfd99c66177568a642947c2959d87582010282c8..594daa8a75d968f500d3248085045a559c3e13fa 100644
(file)
--- a/
clockvector.cc
+++ b/
clockvector.cc
@@
-34,11
+34,11
@@
ClockVector::~ClockVector()
}
/**
}
/**
- * Merge a clock vector into this vector, using a pairwise
vector
. The
+ * Merge a clock vector into this vector, using a pairwise
comparison
. The
* resulting vector length will be the maximum length of the two being merged.
* @param cv is the ClockVector being merged into this vector.
*/
* resulting vector length will be the maximum length of the two being merged.
* @param cv is the ClockVector being merged into this vector.
*/
-void ClockVector::merge(ClockVector *cv)
+void ClockVector::merge(
const
ClockVector *cv)
{
modelclock_t *clk = clock;
bool resize = false;
{
modelclock_t *clk = clock;
bool resize = false;
@@
-84,10
+84,18
@@
bool ClockVector::synchronized_since(const ModelAction *act) const
return false;
}
return false;
}
-/**
- * Gets the clock corresponding to a given thread id from the clock
- * vector. */
+bool ClockVector::has_synchronized_with(const ClockVector *cv) const
+{
+ ASSERT(cv);
+ if (cv->num_threads > num_threads)
+ return false;
+ for (int i = 0; i < cv->num_threads; i++)
+ if (cv->clock[i] > clock[i])
+ return false;
+ return true;
+}
+/** Gets the clock corresponding to a given thread id from the clock vector. */
modelclock_t ClockVector::getClock(thread_id_t thread) {
int threadid = id_to_int(thread);
modelclock_t ClockVector::getClock(thread_id_t thread) {
int threadid = id_to_int(thread);