X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=7d947c63873cc41abc2b0cfb2cff85868ba6765d;hb=f9772fc7b25c7c632e51e0888599f0063bc40d60;hp=2b6a4cc6822c6f202decc866c0d25956908dff85;hpb=f4d77c40b4029cdc18f4aaa5a4e01dfbcfca5f7b;p=model-checker.git

diff --git a/clockvector.cc b/clockvector.cc
index 2b6a4cc..7d947c6 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <cstring>
 #include <stdlib.h>
 
@@ -6,7 +5,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
-#include "threads.h"
+#include "threads-model.h"
 
 /**
  * Constructs a new ClockVector, given a parent ClockVector and a first
@@ -40,27 +39,19 @@ ClockVector::~ClockVector()
  */
 void ClockVector::merge(const ClockVector *cv)
 {
-	modelclock_t *clk = clock;
-	bool resize = false;
-
 	ASSERT(cv != NULL);
 
 	if (cv->num_threads > num_threads) {
-		resize = true;
-		clk = (modelclock_t *)snapshot_malloc(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]);
-
-	if (resize) {
-		for (int i = num_threads; i < cv->num_threads; i++)
-			clk[i] = cv->clock[i];
-		num_threads = cv->num_threads;
-		snapshot_free(clock);
-	}
-	clock = clk;
+	for (int i = 0; i < cv->num_threads; i++)
+		if (cv->clock[i] > clock[i])
+			clock[i] = cv->clock[i];
 }
 
 /**