A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
smx processes are now called actors, avoiding confusions in MC
[simgrid.git]
/
src
/
mc
/
SafetyChecker.cpp
diff --git
a/src/mc/SafetyChecker.cpp
b/src/mc/SafetyChecker.cpp
index
cf1612e
..
47e2e70
100644
(file)
--- a/
src/mc/SafetyChecker.cpp
+++ b/
src/mc/SafetyChecker.cpp
@@
-59,8
+59,7
@@
bool SafetyChecker::checkNonTermination(simgrid::mc::State* current_state)
{
for (auto i = stack_.rbegin(); i != stack_.rend(); ++i)
if (snapshot_compare(i->get(), current_state) == 0){
- XBT_INFO("Non-progressive cycle : state %d -> state %d",
- (*i)->num, current_state->num);
+ XBT_INFO("Non-progressive cycle: state %d -> state %d", (*i)->num, current_state->num);
return true;
}
return false;
@@
-151,8
+150,8
@@
int SafetyChecker::run()
|| (visitedState_ = visitedStates_.addVisitedState(expandedStatesCount_, next_state.get(), true)) == nullptr) {
/* Get an enabled process and insert it in the interleave set of the next state */
- for (auto& p : mc_model_checker->process().
simix_processe
s())
- if (simgrid::mc::
process
_is_enabled(p.copy.getBuffer())) {
+ for (auto& p : mc_model_checker->process().
actor
s())
+ if (simgrid::mc::
actor
_is_enabled(p.copy.getBuffer())) {
next_state->interleave(p.copy.getBuffer());
if (reductionMode_ != simgrid::mc::ReductionMode::none)
break;
@@
-324,10
+323,10
@@
SafetyChecker::SafetyChecker(Session& session) : Checker(session)
XBT_DEBUG("**************************************************");
XBT_DEBUG("Initial state");
- /* Get an enabled
process
and insert it in the interleave set of the initial state */
- for (auto&
p : mc_model_checker->process().simix_processe
s())
- if (simgrid::mc::
process_is_enabled(p
.copy.getBuffer())) {
- initial_state->interleave(
p
.copy.getBuffer());
+ /* Get an enabled
actor
and insert it in the interleave set of the initial state */
+ for (auto&
actor : mc_model_checker->process().actor
s())
+ if (simgrid::mc::
actor_is_enabled(actor
.copy.getBuffer())) {
+ initial_state->interleave(
actor
.copy.getBuffer());
if (reductionMode_ != simgrid::mc::ReductionMode::none)
break;
}