small changes

[c11tester.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index c5bf07709b718f775f0337f6b360f273081c3e08..9820b8f986b8ba93c465674212d2967e1104fd96 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -1,11 +1,12 @@
-#include <algorithm>
 #include <cstring>
 #include <stdlib.h>
 
-#include "model.h"
 #include "action.h"
+
 #include "clockvector.h"
 #include "common.h"
+#include "threads-model.h"
+
 
 /**
  * Constructs a new ClockVector, given a parent ClockVector and a first
@@ -15,14 +16,17 @@
  * same thread or the parent that created this thread)
  * @param act is an action with which to update the ClockVector
  */
-ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
+ClockVector::ClockVector(ClockVector *parent, const ModelAction *act)
 {
-       num_threads = model->get_num_threads();
+       num_threads = act != NULL ? int_to_id(act->get_tid()) + 1 : 0;
+       if (parent && parent->num_threads > num_threads)
+               num_threads = parent->num_threads;
+
        clock = (modelclock_t *)snapshot_calloc(num_threads, sizeof(int));
        if (parent)
                std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
 
-       if (act)
+       if (act != NULL)
                clock[id_to_int(act->get_tid())] = act->get_seq_number();
 }
 
@@ -37,29 +41,51 @@ 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)
 {
-       modelclock_t *clk = clock;
-       bool resize = false;
-
        ASSERT(cv != NULL);
-
+       bool changed = false;
        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]);
+       for (int i = 0;i < cv->num_threads;i++)
+               if (cv->clock[i] > clock[i]) {
+                       clock[i] = cv->clock[i];
+                       changed = true;
+               }
 
-       if (resize) {
-               for (int i = num_threads; i < cv->num_threads; i++)
-                       clk[i] = cv->clock[i];
+       return changed;
+}
+
+/**
+ * Merge a clock vector into this vector, using a pairwise comparison. The
+ * resulting vector length will be the maximum length of the two being merged.
+ * @param cv is the ClockVector being merged into this vector.
+ */
+bool ClockVector::minmerge(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++)
+                       clock[i] = 0;
                num_threads = cv->num_threads;
-               snapshot_free(clock);
        }
-       clock = clk;
+
+       /* Element-wise minimum */
+       for (int i = 0;i < cv->num_threads;i++)
+               if (cv->clock[i] < clock[i]) {
+                       clock[i] = cv->clock[i];
+                       changed = true;
+               }
+
+       return changed;
 }
 
 /**
@@ -83,17 +109,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);
@@ -108,7 +123,7 @@ modelclock_t ClockVector::getClock(thread_id_t thread) {
 void ClockVector::print() const
 {
        int i;
-       printf("CV: (");
-       for (i = 0; i < num_threads; i++)
-               printf("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+       model_print("(");
+       for (i = 0;i < num_threads;i++)
+               model_print("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
 }