execution: move execution number back to ModelChecker class

[model-checker.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 6cd943b835b2ec2915b992101549961f622ec4ee..0945bcf751dcd7eca5de6159affea9db49c58e3f 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -37,21 +37,25 @@ ClockVector::~ClockVector()
  * 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;
 }
 
 /**