optimize hashtable so we don't always build new ones for cyclegraph check

[cdsspec-compiler.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 740b5cf2793de217eea47342e5a785537d016362..e56c2ace662507be12875c18446932fe54593252 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++)
@@ -72,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);