changes to fix at least a bug

[model-checker.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 740b5cf2793de217eea47342e5a785537d016362..7d947c63873cc41abc2b0cfb2cff85868ba6765d 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,4 +1,3 @@
-#include <algorithm>
 #include <cstring>
 #include <stdlib.h>
 
@@ -42,8 +41,12 @@ void ClockVector::merge(const ClockVector *cv)
 {
        ASSERT(cv != NULL);
 
-       if (cv->num_threads > num_threads)
+       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++)
+                       clock[i] = 0;
+               num_threads = cv->num_threads;
+       }
 
        /* Element-wise maximum */
        for (int i = 0; i < cv->num_threads; i++)