X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=clockvector.cc;h=367fa6e2763dd6636e78d212632f6aa954cda63c;hb=8294305a6c0b9c0aa16485cf1d48f47200a8c8ab;hp=aaf492d896cab61c6b8395e375eebd6044f55ff5;hpb=7ccfaf5b2ca3db6abb7312b0f4bb778be25cc17f;p=model-checker.git diff --git a/clockvector.cc b/clockvector.cc index aaf492d..367fa6e 100644 --- a/clockvector.cc +++ b/clockvector.cc @@ -1,5 +1,6 @@ #include #include +#include #include "model.h" #include "action.h" @@ -8,14 +9,13 @@ ClockVector::ClockVector(ClockVector *parent, ModelAction *act) { - num_threads = parent ? parent->num_threads : 1; - if (act && act->get_type() == THREAD_CREATE) - num_threads++; + num_threads = model->get_num_threads(); clock = (int *)MYMALLOC(num_threads * sizeof(int)); + memset(clock, 0, num_threads * sizeof(int)); if (parent) std::memcpy(clock, parent->clock, parent->num_threads * sizeof(int)); else - clock[0] = 0; + clock[0] = 1; if (act) clock[id_to_int(act->get_tid())] = act->get_seq_number();