merge in master

[model-checker.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 190f9216a92b61ad68df0990775d4c978aaa53f9..594daa8a75d968f500d3248085045a559c3e13fa 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -84,10 +84,18 @@ bool ClockVector::synchronized_since(const ModelAction *act) const
        return false;
 }
 
-/**
- * Gets the clock corresponding to a given thread id from the clock
- * vector. */
+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);