X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=3363f7f4622bdd3de10baffc7c058692cbb8ac95;hb=0afac4a7183b60920f562ebe26ce49d29114645c;hp=1956b18a127742a3584b0abfa74233fb92332c3c;hpb=9b784333e1a62ed6d258e96502a5733041389c8f;p=model-checker.git
diff --git a/clockvector.cc b/clockvector.cc
index 1956b18..3363f7f 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -6,6 +6,7 @@
#include "action.h"
#include "clockvector.h"
#include "common.h"
+#include "threads-model.h"
/**
* Constructs a new ClockVector, given a parent ClockVector and a first
@@ -18,10 +19,9 @@
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)
- std::memcpy(clock, parent->clock, parent->num_threads * sizeof(int));
+ std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
if (act)
clock[id_to_int(act->get_tid())] = act->get_seq_number();
@@ -30,37 +30,27 @@ ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
/** @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.
*/
-void ClockVector::merge(ClockVector *cv)
+void ClockVector::merge(const ClockVector *cv)
{
- int *clk = clock;
- bool resize = false;
-
ASSERT(cv != NULL);
if (cv->num_threads > num_threads) {
- resize = true;
- clk = (int *)MYMALLOC(cv->num_threads * sizeof(int));
+ clock = (modelclock_t *)snapshot_realloc(clock, cv->num_threads * sizeof(modelclock_t));
+ num_threads = cv->num_threads;
}
/* Element-wise maximum */
- for (int i = 0; i < num_threads; i++)
- clk[i] = std::max(clock[i], cv->clock[i]);
-
- if (resize) {
- for (int i = num_threads; i < cv->num_threads; i++)
- clk[i] = cv->clock[i];
- num_threads = cv->num_threads;
- MYFREE(clock);
- }
- clock = clk;
+ for (int i = 0; i < cv->num_threads; i++)
+ if (cv->clock[i] > clock[i])
+ clock[i] = cv->clock[i];
}
/**
@@ -75,7 +65,7 @@ void ClockVector::merge(ClockVector *cv)
* thread, false otherwise. That is, this function returns:
*
act <= cv[act->tid]
*/
-bool ClockVector::synchronized_since(ModelAction *act) const
+bool ClockVector::synchronized_since(const ModelAction *act) const
{
int i = id_to_int(act->get_tid());
@@ -84,11 +74,19 @@ bool ClockVector::synchronized_since(ModelAction *act) const
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)
@@ -103,5 +101,5 @@ void ClockVector::print() const
int i;
printf("CV: (");
for (i = 0; i < num_threads; i++)
- printf("%2d%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+ printf("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
}