#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
* ModelAction. This constructor can assign appropriate default settings if no
* 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();
+ 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 */
* 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)
{
ASSERT(cv != NULL);
-
+ bool changed = false;
if (cv->num_threads > num_threads) {
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++)
clock[i] = 0;
num_threads = cv->num_threads;
}
/* Element-wise maximum */
- for (int i = 0; i < cv->num_threads; i++)
- if (cv->clock[i] > clock[i])
+ for (int i = 0;i < cv->num_threads;i++)
+ if (cv->clock[i] > clock[i]) {
clock[i] = cv->clock[i];
+ changed = true;
+ }
+
+ return changed;
}
/**
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" : ", ");
}