model: release/acquire synchronization

[c11tester.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 5a7c5349b3cd98ad446e0eb90189cd4b695dbbfa..88ea6fdfcf7cc73a8b99239e9128180883ca55bb 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -34,11 +34,11 @@ ClockVector::~ClockVector()
 }
 
 /**
- * Merge a clock vector into this vector, using a pairwise vector. The
+ * 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.
  */
-void ClockVector::merge(ClockVector *cv)
+void ClockVector::merge(const ClockVector *cv)
 {
        modelclock_t *clk = clock;
        bool resize = false;
@@ -75,7 +75,7 @@ void ClockVector::merge(ClockVector *cv)
  * thread, false otherwise. That is, this function returns:
  * <BR><CODE>act <= cv[act->tid]</CODE>
  */
-bool ClockVector::synchronized_since(ModelAction *act) const
+bool ClockVector::synchronized_since(const ModelAction *act) const
 {
        int i = id_to_int(act->get_tid());
 
@@ -88,7 +88,7 @@ bool ClockVector::synchronized_since(ModelAction *act) const
  * Gets the clock corresponding to a given thread id from the clock
  * vector. */
 
-int ClockVector::getClock(thread_id_t thread) {
+modelclock_t ClockVector::getClock(thread_id_t thread) {
        int threadid = id_to_int(thread);
 
        if (threadid < num_threads)