-#include <algorithm>
#include <cstring>
#include <stdlib.h>
-#include "model.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
* same thread or the parent that created this thread)
* @param act is an action with which to update the ClockVector
*/
-ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
+ClockVector::ClockVector(ClockVector *parent, const ModelAction *act)
{
- num_threads = model->get_num_threads();
- clock = (modelclock_t *)MYMALLOC(num_threads * sizeof(int));
- memset(clock, 0, num_threads * sizeof(int));
+ ASSERT(act);
+ num_threads = int_to_id(act->get_tid()) + 1;
+ if (parent && parent->num_threads > num_threads)
+ num_threads = parent->num_threads;
+
+ clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
if (parent)
std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
- if (act)
- clock[id_to_int(act->get_tid())] = act->get_seq_number();
+ clock[id_to_int(act->get_tid())] = act->get_seq_number();
}
/** @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)
+bool ClockVector::merge(const ClockVector *cv)
{
- modelclock_t *clk = clock;
- bool resize = false;
-
ASSERT(cv != NULL);
-
+ bool changed = false;
if (cv->num_threads > num_threads) {
- resize = true;
- clk = (modelclock_t *)MYMALLOC(cv->num_threads * sizeof(modelclock_t));
+ clock = (modelclock_t *)snapshot_realloc(clock, cv->num_threads * sizeof(modelclock_t));
+ for (int i = num_threads;i < cv->num_threads;i++)
+ clock[i] = 0;
+ 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]);
+ for (int i = 0;i < cv->num_threads;i++)
+ if (cv->clock[i] > clock[i]) {
+ clock[i] = cv->clock[i];
+ changed = true;
+ }
- 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;
+ return changed;
}
/**
* 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());
return false;
}
-/**
- * Gets the clock corresponding to a given thread id from the clock
- * vector. */
-
+/** 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);
void ClockVector::print() const
{
int i;
- printf("CV: (");
- for (i = 0; i < num_threads; i++)
- printf("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+ model_print("(");
+ for (i = 0;i < num_threads;i++)
+ model_print("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
}