* 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])
+ if (cv->clock[i] > clock[i]) {
clock[i] = cv->clock[i];
+ changed = true;
+ }
+
+ return changed;
}
/**
void ClockVector::print() const
{
int i;
- printf("CV: (");
+ model_print("CV: (");
for (i = 0; i < num_threads; i++)
- printf("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+ model_print("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
}