projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(bug) revert JOIN/LOCK simplification
[model-checker.git]
/
clockvector.cc
diff --git
a/clockvector.cc
b/clockvector.cc
index 1956b18a127742a3584b0abfa74233fb92332c3c..c5bf07709b718f775f0337f6b360f273081c3e08 100644
(file)
--- a/
clockvector.cc
+++ b/
clockvector.cc
@@
-18,10
+18,9
@@
ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
{
num_threads = model->get_num_threads();
ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
{
num_threads = model->get_num_threads();
- clock = (int *)MYMALLOC(num_threads * sizeof(int));
- memset(clock, 0, num_threads * sizeof(int));
+ clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
if (parent)
if (parent)
- std::memcpy(clock, parent->clock, parent->num_threads * sizeof(
in
t));
+ std::memcpy(clock, parent->clock, parent->num_threads * sizeof(
modelclock_
t));
if (act)
clock[id_to_int(act->get_tid())] = act->get_seq_number();
if (act)
clock[id_to_int(act->get_tid())] = act->get_seq_number();
@@
-30,24
+29,24
@@
ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
/** @brief Destructor */
ClockVector::~ClockVector()
{
/** @brief Destructor */
ClockVector::~ClockVector()
{
-
MYFREE
(clock);
+
snapshot_free
(clock);
}
/**
}
/**
- * 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)
{
{
-
in
t *clk = clock;
+
modelclock_
t *clk = clock;
bool resize = false;
ASSERT(cv != NULL);
if (cv->num_threads > num_threads) {
resize = true;
bool resize = false;
ASSERT(cv != NULL);
if (cv->num_threads > num_threads) {
resize = true;
- clk = (
int *)MYMALLOC(cv->num_threads * sizeof(in
t));
+ clk = (
modelclock_t *)snapshot_malloc(cv->num_threads * sizeof(modelclock_
t));
}
/* Element-wise maximum */
}
/* Element-wise maximum */
@@
-58,7
+57,7
@@
void ClockVector::merge(ClockVector *cv)
for (int i = num_threads; i < cv->num_threads; i++)
clk[i] = cv->clock[i];
num_threads = cv->num_threads;
for (int i = num_threads; i < cv->num_threads; i++)
clk[i] = cv->clock[i];
num_threads = cv->num_threads;
-
MYFREE
(clock);
+
snapshot_free
(clock);
}
clock = clk;
}
}
clock = clk;
}
@@
-75,7
+74,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
+83,19
@@
bool ClockVector::synchronized_since(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;
+}
-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)
@@
-103,5
+110,5
@@
void ClockVector::print() const
int i;
printf("CV: (");
for (i = 0; i < num_threads; i++)
int i;
printf("CV: (");
for (i = 0; i < num_threads; i++)
- printf("%2
d
%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+ printf("%2
u
%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
}
}