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:
3dbbf34
)
model: refactor/reword initialize_curr_action()
author
Brian Norris
<banorris@uci.edu>
Tue, 2 Oct 2012 00:37:02 +0000
(17:37 -0700)
committer
Brian Norris
<banorris@uci.edu>
Tue, 2 Oct 2012 00:40:21 +0000
(17:40 -0700)
model.cc
patch
|
blob
|
history
diff --git
a/model.cc
b/model.cc
index c4bc693ef5560f646684b3a2cb002e685f4be848..9dc1d37c71bb6ac93844d057efd7928818d7e053 100644
(file)
--- a/
model.cc
+++ b/
model.cc
@@
-543,16
+543,19
@@
ModelAction * ModelChecker::initialize_curr_action(ModelAction *curr)
/* Discard duplicate ModelAction; use action from NodeStack */
delete curr;
/* Discard duplicate ModelAction; use action from NodeStack */
delete curr;
+ /* Always compute new clock vector */
newcurr->create_cv(get_parent_action(newcurr->get_tid()));
} else {
newcurr = curr;
newcurr->create_cv(get_parent_action(newcurr->get_tid()));
} else {
newcurr = curr;
+
+ /* Always compute new clock vector */
+ newcurr->create_cv(get_parent_action(newcurr->get_tid()));
/*
* Perform one-time actions when pushing new ModelAction onto
* NodeStack
*/
/*
* Perform one-time actions when pushing new ModelAction onto
* NodeStack
*/
- curr->create_cv(get_parent_action(curr->get_tid()));
- if (curr->is_write())
- compute_promises(curr);
+ if (newcurr->is_write())
+ compute_promises(newcurr);
}
return newcurr;
}
}
return newcurr;
}