ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
{
num_threads = model->get_num_threads();
- clock = (int *)MYMALLOC(num_threads * sizeof(int));
+ clock = (modelclock_t *)MYMALLOC(num_threads * sizeof(int));
memset(clock, 0, 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();
}
/**
- * 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;
+ modelclock_t *clk = clock;
bool resize = false;
ASSERT(cv != NULL);
if (cv->num_threads > num_threads) {
resize = true;
- clk = (int *)MYMALLOC(cv->num_threads * sizeof(int));
+ clk = (modelclock_t *)MYMALLOC(cv->num_threads * sizeof(modelclock_t));
}
/* Element-wise maximum */
* 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. */
+modelclock_t ClockVector::getClock(thread_id_t thread) {
+ int threadid = id_to_int(thread);
+
+ if (threadid < num_threads)
+ return clock[threadid];
+ else
+ return 0;
+}
+
/** @brief Formats and prints this ClockVector's data. */
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" : ", ");
}