From c2b7fc251420c50f51bf9c7f07f37d82b2bfc068 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Tue, 16 Apr 2013 11:29:11 -0700 Subject: [PATCH] clockvector: don't use global get_num_threads() --- clockvector.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/clockvector.cc b/clockvector.cc index 0945bcf..0b32528 100644 --- a/clockvector.cc +++ b/clockvector.cc @@ -1,7 +1,6 @@ #include #include -#include "model.h" #include "action.h" #include "clockvector.h" #include "common.h" @@ -17,13 +16,16 @@ */ ClockVector::ClockVector(ClockVector *parent, ModelAction *act) { - num_threads = model->get_num_threads(); + ASSERT(act); + num_threads = int_to_id(act->get_tid()) + 1; + 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) - clock[id_to_int(act->get_tid())] = act->get_seq_number(); + clock[id_to_int(act->get_tid())] = act->get_seq_number(); } /** @brief Destructor */ -- 2.34.1