projects
/
model-checker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
634ad19
)
clockvector: don't use global get_num_threads()
author
Brian Norris
<banorris@uci.edu>
Tue, 16 Apr 2013 18:29:11 +0000
(11:29 -0700)
committer
Brian Norris
<banorris@uci.edu>
Tue, 16 Apr 2013 18:38:01 +0000
(11:38 -0700)
clockvector.cc
patch
|
blob
|
history
diff --git
a/clockvector.cc
b/clockvector.cc
index 0945bcf751dcd7eca5de6159affea9db49c58e3f..0b325281007e35505f993c2f9798f5b02765621c 100644
(file)
--- a/
clockvector.cc
+++ b/
clockvector.cc
@@
-1,7
+1,6
@@
#include <cstring>
#include <stdlib.h>
#include <cstring>
#include <stdlib.h>
-#include "model.h"
#include "action.h"
#include "clockvector.h"
#include "common.h"
#include "action.h"
#include "clockvector.h"
#include "common.h"
@@
-17,13
+16,16
@@
*/
ClockVector::ClockVector(ClockVector *parent, ModelAction *act)
{
*/
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));
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 */
}
/** @brief Destructor */