model: print bug reports at end of each execution

[c11tester.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 2b6a4cc6822c6f202decc866c0d25956908dff85..e56c2ace662507be12875c18446932fe54593252 100644 (file)
--- 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];
 }
 
 /**
@@ -84,17 +75,6 @@ bool ClockVector::synchronized_since(const ModelAction *act) const
        return false;
 }
 
-bool ClockVector::has_synchronized_with(const ClockVector *cv) const
-{
-       ASSERT(cv);
-       if (cv->num_threads > num_threads)
-               return false;
-       for (int i = 0; i < cv->num_threads; i++)
-               if (cv->clock[i] > clock[i])
-                       return false;
-       return true;
-}
-
 /** Gets the clock corresponding to a given thread id from the clock vector. */
 modelclock_t ClockVector::getClock(thread_id_t thread) {
        int threadid = id_to_int(thread);