X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=clockvector.h;h=56037eb6bfcd2f37a5110d12a7f733e79faad8b0;hb=1dbc6ce8102e79ead8c3ae09214126abab1b5c51;hp=b7d720688a1c6df4a9aad410e1eb4897b08d35ff;hpb=cf7518cb8c2d9cd3033ca7540ea9dc448b21912a;p=model-checker.git diff --git a/clockvector.h b/clockvector.h index b7d7206..56037eb 100644 --- a/clockvector.h +++ b/clockvector.h @@ -8,6 +8,7 @@ #include "threads.h" #include "mymemory.h" +typedef unsigned int modelclock_t; /* Forward declaration */ class ModelAction; @@ -15,15 +16,16 @@ class ClockVector { public: ClockVector(ClockVector *parent = NULL, ModelAction *act = NULL); ~ClockVector(); - void merge(ClockVector *cv); - bool synchronized_since(ModelAction *act) const; + void merge(const ClockVector *cv); + bool synchronized_since(const ModelAction *act) const; void print() const; + modelclock_t getClock(thread_id_t thread); MEMALLOC private: /** @brief Holds the actual clock data, as an array. */ - int *clock; + modelclock_t *clock; /** @brief The number of threads recorded in clock (i.e., its length). */ int num_threads;