projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
run.sh: fixup run script
[model-checker.git]
/
clockvector.cc
diff --git
a/clockvector.cc
b/clockvector.cc
index 5a7c5349b3cd98ad446e0eb90189cd4b695dbbfa..6c6e2fa579e606377ec45bed18bddac8d357cbb8 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;
@@
-75,7
+75,7
@@
void ClockVector::merge(ClockVector *cv)
* thread, false otherwise. That is, this function returns:
* <BR><CODE>act <= cv[act->tid]</CODE>
*/
* thread, false otherwise. That is, this function returns:
* <BR><CODE>act <= cv[act->tid]</CODE>
*/
-bool ClockVector::synchronized_since(ModelAction *act) const
+bool ClockVector::synchronized_since(
const
ModelAction *act) const
{
int i = id_to_int(act->get_tid());
{
int i = id_to_int(act->get_tid());
@@
-84,11
+84,8
@@
bool ClockVector::synchronized_since(ModelAction *act) const
return false;
}
return false;
}
-/**
- * Gets the clock corresponding to a given thread id from the clock
- * vector. */
-
-int ClockVector::getClock(thread_id_t thread) {
+/** 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);
if (threadid < num_threads)
int threadid = id_to_int(thread);
if (threadid < num_threads)