projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move license to LICENSE file
[model-checker.git]
/
clockvector.cc
diff --git
a/clockvector.cc
b/clockvector.cc
index 2b6a4cc6822c6f202decc866c0d25956908dff85..0945bcf751dcd7eca5de6159affea9db49c58e3f 100644
(file)
--- a/
clockvector.cc
+++ b/
clockvector.cc
@@
-1,4
+1,3
@@
-#include <algorithm>
#include <cstring>
#include <stdlib.h>
#include <cstring>
#include <stdlib.h>
@@
-6,7
+5,7
@@
#include "action.h"
#include "clockvector.h"
#include "common.h"
#include "action.h"
#include "clockvector.h"
#include "common.h"
-#include "threads.h"
+#include "threads
-model
.h"
/**
* Constructs a new ClockVector, given a parent ClockVector and a first
/**
* Constructs a new ClockVector, given a parent ClockVector and a first
@@
-38,29
+37,25
@@
ClockVector::~ClockVector()
* 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(const ClockVector *cv)
+
bool
ClockVector::merge(const ClockVector *cv)
{
{
- modelclock_t *clk = clock;
- bool resize = false;
-
ASSERT(cv != NULL);
ASSERT(cv != NULL);
-
+ bool changed = false;
if (cv->num_threads > num_threads) {
if (cv->num_threads > num_threads) {
- resize = true;
- clk = (modelclock_t *)snapshot_malloc(cv->num_threads * sizeof(modelclock_t));
- }
-
- /* Element-wise maximum */
- for (int i = 0; i < num_threads; i++)
- clk[i] = std::max(clock[i], cv->clock[i]);
-
- if (resize) {
+ clock = (modelclock_t *)snapshot_realloc(clock, cv->num_threads * sizeof(modelclock_t));
for (int i = num_threads; i < cv->num_threads; i++)
for (int i = num_threads; i < cv->num_threads; i++)
- cl
k[i] = cv->clock[i]
;
+ cl
ock[i] = 0
;
num_threads = cv->num_threads;
num_threads = cv->num_threads;
- snapshot_free(clock);
}
}
- clock = clk;
+
+ /* Element-wise maximum */
+ for (int i = 0; i < cv->num_threads; i++)
+ if (cv->clock[i] > clock[i]) {
+ clock[i] = cv->clock[i];
+ changed = true;
+ }
+
+ return changed;
}
/**
}
/**
@@
-84,17
+79,6
@@
bool ClockVector::synchronized_since(const ModelAction *act) const
return false;
}
return false;
}
-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);
/** 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);
@@
-109,7
+93,7
@@
modelclock_t ClockVector::getClock(thread_id_t thread) {
void ClockVector::print() const
{
int i;
void ClockVector::print() const
{
int i;
-
printf
("CV: (");
+
model_print
("CV: (");
for (i = 0; i < num_threads; i++)
for (i = 0; i < num_threads; i++)
-
printf
("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+
model_print
("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
}
}