X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=740b5cf2793de217eea47342e5a785537d016362;hb=a09a4346390cc28a29428ee5a0610b1054aa48ed;hp=062ac4148e6573a4f00f59ccd6b947c5d37259e7;hpb=fe7b400edb33255770fb47ad520afbd05d13a231;p=model-checker.git

diff --git a/clockvector.cc b/clockvector.cc
index 062ac41..740b5cf 100644
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -40,27 +40,15 @@ 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));
-	}
+	if (cv->num_threads > num_threads)
+		clock = (modelclock_t *)snapshot_realloc(clock, cv->num_threads * sizeof(modelclock_t));
 
 	/* 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];
 }
 
 /**