rename threads.h -> threads-model.h

[c11tester.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 6c6e2fa579e606377ec45bed18bddac8d357cbb8..062ac4148e6573a4f00f59ccd6b947c5d37259e7 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -6,6 +6,7 @@
 #include "action.h"
 #include "clockvector.h"
 #include "common.h"
+#include "threads-model.h"
 
 /**
  * Constructs a new ClockVector, given a parent ClockVector and a first
@@ -18,8 +19,7 @@
 ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
 {
        num_threads = model->get_num_threads();
-       clock = (modelclock_t *)MYMALLOC(num_threads * sizeof(int));
-       memset(clock, 0, num_threads * sizeof(int));
+       clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
        if (parent)
                std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
 
@@ -30,7 +30,7 @@ ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
 /** @brief Destructor */
 ClockVector::~ClockVector()
 {
-       MYFREE(clock);
+       snapshot_free(clock);
 }
 
 /**
@@ -47,7 +47,7 @@ void ClockVector::merge(const ClockVector *cv)
 
        if (cv->num_threads > num_threads) {
                resize = true;
-               clk = (modelclock_t *)MYMALLOC(cv->num_threads * sizeof(modelclock_t));
+               clk = (modelclock_t *)snapshot_malloc(cv->num_threads * sizeof(modelclock_t));
        }
 
        /* Element-wise maximum */
@@ -58,7 +58,7 @@ void ClockVector::merge(const ClockVector *cv)
                for (int i = num_threads; i < cv->num_threads; i++)
                        clk[i] = cv->clock[i];
                num_threads = cv->num_threads;
-               MYFREE(clock);
+               snapshot_free(clock);
        }
        clock = clk;
 }
@@ -84,6 +84,17 @@ 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);