run.sh: fixup run script

[model-checker.git] / clockvector.cc

diff --git a/clockvector.cc b/clockvector.cc
index 1956b18a127742a3584b0abfa74233fb92332c3c..6c6e2fa579e606377ec45bed18bddac8d357cbb8 100644 (file)
--- a/clockvector.cc
+++ b/clockvector.cc
@@ -18,10 +18,10 @@
 ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
 {
        num_threads = model->get_num_threads();
-       clock = (int *)MYMALLOC(num_threads * sizeof(int));
+       clock = (modelclock_t *)MYMALLOC(num_threads * sizeof(int));
        memset(clock, 0, num_threads * sizeof(int));
        if (parent)
-               std::memcpy(clock, parent->clock, parent->num_threads * sizeof(int));
+               std::memcpy(clock, parent->clock, parent->num_threads * sizeof(modelclock_t));
 
        if (act)
                clock[id_to_int(act->get_tid())] = act->get_seq_number();
@@ -34,20 +34,20 @@ 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)
 {
-       int *clk = clock;
+       modelclock_t *clk = clock;
        bool resize = false;
 
        ASSERT(cv != NULL);
 
        if (cv->num_threads > num_threads) {
                resize = true;
-               clk = (int *)MYMALLOC(cv->num_threads * sizeof(int));
+               clk = (modelclock_t *)MYMALLOC(cv->num_threads * sizeof(modelclock_t));
        }
 
        /* Element-wise maximum */
@@ -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());
 
@@ -84,11 +84,8 @@ bool ClockVector::synchronized_since(ModelAction *act) const
        return false;
 }
 
-/** 
- * Gets the clock corresponding to a given thread id from the clock
- * vector. */
-
-int ClockVector::getClock(thread_id_t thread) {
+/** 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);
 
        if (threadid < num_threads)
@@ -103,5 +100,5 @@ void ClockVector::print() const
        int i;
        printf("CV: (");
        for (i = 0; i < num_threads; i++)
-               printf("%2d%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
+               printf("%2u%s", clock[i], (i == num_threads - 1) ? ")\n" : ", ");
 }