projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mutex: move mutex.h to standard name/location
[model-checker.git]
/
clockvector.cc
diff --git
a/clockvector.cc
b/clockvector.cc
index cfd99c66177568a642947c2959d87582010282c8..062ac4148e6573a4f00f59ccd6b947c5d37259e7 100644
(file)
--- a/
clockvector.cc
+++ b/
clockvector.cc
@@
-6,6
+6,7
@@
#include "action.h"
#include "clockvector.h"
#include "common.h"
#include "action.h"
#include "clockvector.h"
#include "common.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
@@
-18,8
+19,7
@@
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 = (modelclock_t *)MYMALLOC(num_threads * sizeof(int));
- memset(clock, 0, num_threads * sizeof(int));
+ clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
if (parent)
std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
if (parent)
std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
@@
-30,15
+30,15
@@
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)
{
modelclock_t *clk = clock;
bool resize = false;
{
modelclock_t *clk = clock;
bool resize = false;
@@
-47,7
+47,7
@@
void ClockVector::merge(ClockVector *cv)
if (cv->num_threads > num_threads) {
resize = true;
if (cv->num_threads > num_threads) {
resize = true;
- clk = (modelclock_t *)
MYMALLOC
(cv->num_threads * sizeof(modelclock_t));
+ clk = (modelclock_t *)
snapshot_malloc
(cv->num_threads * sizeof(modelclock_t));
}
/* Element-wise maximum */
}
/* Element-wise maximum */
@@
-58,7
+58,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;
}
@@
-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);