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
make it easier to see the problem in this (failing) test
[simgrid.git]
/
src
/
mc
/
checker
/
SafetyChecker.cpp
diff --git
a/src/mc/checker/SafetyChecker.cpp
b/src/mc/checker/SafetyChecker.cpp
index
2d766e2
..
7906265
100644
(file)
--- a/
src/mc/checker/SafetyChecker.cpp
+++ b/
src/mc/checker/SafetyChecker.cpp
@@
-1,5
+1,4
@@
-/* Copyright (c) 2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2016-2017. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-14,18
+13,15
@@
#include <xbt/log.h>
#include <xbt/sysdep.h>
#include <xbt/log.h>
#include <xbt/sysdep.h>
-#include "src/mc/mc_state.h"
-#include "src/mc/mc_request.h"
-#include "src/mc/mc_safety.h"
+#include "src/mc/Session.hpp"
+#include "src/mc/Transition.hpp"
+#include "src/mc/VisitedState.hpp"
+#include "src/mc/checker/SafetyChecker.hpp"
+#include "src/mc/mc_exit.h"
#include "src/mc/mc_private.h"
#include "src/mc/mc_record.h"
#include "src/mc/mc_private.h"
#include "src/mc/mc_record.h"
+#include "src/mc/mc_request.h"
#include "src/mc/mc_smx.h"
#include "src/mc/mc_smx.h"
-#include "src/mc/Client.hpp"
-#include "src/mc/mc_exit.h"
-#include "src/mc/checker/SafetyChecker.hpp"
-#include "src/mc/VisitedState.hpp"
-#include "src/mc/Transition.hpp"
-#include "src/mc/Session.hpp"
#include "src/xbt/mmalloc/mmprivate.h"
#include "src/xbt/mmalloc/mmprivate.h"
@@
-93,9
+89,9
@@
void SafetyChecker::run()
{
/* This function runs the DFS algorithm the state space.
* We do so iteratively instead of recursively, dealing with the call stack manually.
{
/* This function runs the DFS algorithm the state space.
* We do so iteratively instead of recursively, dealing with the call stack manually.
- * This allows to explore the call stack
when we want to
. */
+ * This allows to explore the call stack
at wish
. */
- while (
!
stack_.empty()) {
+ while (
not
stack_.empty()) {
/* Get current state */
simgrid::mc::State* state = stack_.back().get();
/* Get current state */
simgrid::mc::State* state = stack_.back().get();
@@
-116,7
+112,7
@@
void SafetyChecker::run()
// Backtrack if we are revisiting a state we saw previously
if (visitedState_ != nullptr) {
XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.",
// Backtrack if we are revisiting a state we saw previously
if (visitedState_ != nullptr) {
XBT_DEBUG("State already visited (equal to state %d), exploration stopped on this path.",
- visitedState_->o
ther_num == -1 ? visitedState_->num : visitedState_->other
_num);
+ visitedState_->o
riginal_num == -1 ? visitedState_->num : visitedState_->original
_num);
visitedState_ = nullptr;
this->backtrack();
visitedState_ = nullptr;
this->backtrack();
@@
-124,7
+120,10
@@
void SafetyChecker::run()
}
// Search an enabled transition in the current state; backtrack if the interleave set is empty
}
// Search an enabled transition in the current state; backtrack if the interleave set is empty
+ // get_request also sets state.transition to be the one corresponding to the returned req
smx_simcall_t req = MC_state_get_request(state);
smx_simcall_t req = MC_state_get_request(state);
+ // req is now the transition of the process that was selected to be executed
+
if (req == nullptr) {
XBT_DEBUG("There are no more processes to interleave. (depth %zi)", stack_.size() + 1);
if (req == nullptr) {
XBT_DEBUG("There are no more processes to interleave. (depth %zi)", stack_.size() + 1);
@@
-144,10
+143,10
@@
void SafetyChecker::run()
mc_model_checker->executed_transitions++;
mc_model_checker->executed_transitions++;
- /* A
nswer the request
*/
+ /* A
ctually answer the request: let execute the selected request (MCed does one step)
*/
this->getSession().execute(state->transition);
this->getSession().execute(state->transition);
- /* Create the new expanded state */
+ /* Create the new expanded state
(copy the state of MCed into our MCer data)
*/
std::unique_ptr<simgrid::mc::State> next_state =
std::unique_ptr<simgrid::mc::State>(new simgrid::mc::State(++expandedStatesCount_));
std::unique_ptr<simgrid::mc::State> next_state =
std::unique_ptr<simgrid::mc::State>(new simgrid::mc::State(++expandedStatesCount_));
@@
-155,28
+154,30
@@
void SafetyChecker::run()
this->checkNonTermination(next_state.get());
/* Check whether we already explored next_state in the past (but only if interested in state-equality reduction) */
this->checkNonTermination(next_state.get());
/* Check whether we already explored next_state in the past (but only if interested in state-equality reduction) */
- if (_sg_mc_
visited == true
)
+ if (_sg_mc_
max_visited_states > 0
)
visitedState_ = visitedStates_.addVisitedState(expandedStatesCount_, next_state.get(), true);
/* If this is a new state (or if we don't care about state-equality reduction) */
if (visitedState_ == nullptr) {
/* Get an enabled process and insert it in the interleave set of the next state */
visitedState_ = visitedStates_.addVisitedState(expandedStatesCount_, next_state.get(), true);
/* If this is a new state (or if we don't care about state-equality reduction) */
if (visitedState_ == nullptr) {
/* Get an enabled process and insert it in the interleave set of the next state */
- for (auto& actor : mc_model_checker->process().actors())
- if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer())) {
- next_state->interleave(actor.copy.getBuffer());
+ for (auto& remoteActor : mc_model_checker->process().actors()) {
+ auto actor = remoteActor.copy.getBuffer();
+ if (simgrid::mc::actor_is_enabled(actor)) {
+ next_state->addInterleavingSet(actor);
if (reductionMode_ == simgrid::mc::ReductionMode::dpor)
if (reductionMode_ == simgrid::mc::ReductionMode::dpor)
- break;
+ break;
// With DPOR, we take the first enabled transition
}
}
+ }
if (dot_output != nullptr)
std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
state->num, next_state->num, req_str.c_str());
} else if (dot_output != nullptr)
if (dot_output != nullptr)
std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
state->num, next_state->num, req_str.c_str());
} else if (dot_output != nullptr)
- std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
-
state->
num,
-
visitedState_->other_num == -1 ? visitedState_->num : visitedState_->other_num,
req_str.c_str());
+ std::fprintf(dot_output, "\"%d\" -> \"%d\" [%s];\n",
state->num,
+
visitedState_->original_num == -1 ? visitedState_->num : visitedState_->original_
num,
+
req_str.c_str());
stack_.push_back(std::move(next_state));
}
stack_.push_back(std::move(next_state));
}
@@
-202,14
+203,14
@@
void SafetyChecker::backtrack()
executed before it. If it does then add it to the interleave set of the
state that executed that previous request. */
executed before it. If it does then add it to the interleave set of the
state that executed that previous request. */
- while (
!
stack_.empty()) {
+ while (
not
stack_.empty()) {
std::unique_ptr<simgrid::mc::State> state = std::move(stack_.back());
stack_.pop_back();
if (reductionMode_ == simgrid::mc::ReductionMode::dpor) {
smx_simcall_t req = &state->internal_req;
if (req->call == SIMCALL_MUTEX_LOCK || req->call == SIMCALL_MUTEX_TRYLOCK)
std::unique_ptr<simgrid::mc::State> state = std::move(stack_.back());
stack_.pop_back();
if (reductionMode_ == simgrid::mc::ReductionMode::dpor) {
smx_simcall_t req = &state->internal_req;
if (req->call == SIMCALL_MUTEX_LOCK || req->call == SIMCALL_MUTEX_TRYLOCK)
- xbt_die("Mutex is currently not supported with DPOR,
"
- "use --cfg=model-check/reduction:none");
+ xbt_die("Mutex is currently not supported with DPOR,
use --cfg=model-check/reduction:none");
+
const smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) {
simgrid::mc::State* prev_state = i->get();
const smx_actor_t issuer = MC_smx_simcall_get_issuer(req);
for (auto i = stack_.rbegin(); i != stack_.rend(); ++i) {
simgrid::mc::State* prev_state = i->get();
@@
-230,8
+231,8
@@
void SafetyChecker::backtrack()
state->num);
}
state->num);
}
- if (
!prev_state->process
States[issuer->pid].isDone())
- prev_state->
interleave
(issuer);
+ if (
not prev_state->actor
States[issuer->pid].isDone())
+ prev_state->
addInterleavingSet
(issuer);
else
XBT_DEBUG("Process %p is in done set", req->issuer);
else
XBT_DEBUG("Process %p is in done set", req->issuer);
@@
-245,7
+246,7
@@
void SafetyChecker::backtrack()
} else {
const smx_actor_t previous_issuer = MC_smx_simcall_get_issuer(&prev_state->internal_req);
} else {
const smx_actor_t previous_issuer = MC_smx_simcall_get_issuer(&prev_state->internal_req);
- XBT_DEBUG("Simcall %d, process %lu (state %d) and simcall %d, process %lu (state %d) are independ
a
nt",
+ XBT_DEBUG("Simcall %d, process %lu (state %d) and simcall %d, process %lu (state %d) are independ
e
nt",
req->call, issuer->pid, state->num,
prev_state->internal_req.call,
previous_issuer->pid,
req->call, issuer->pid, state->num,
prev_state->internal_req.call,
previous_issuer->pid,
@@
-258,8
+259,7
@@
void SafetyChecker::backtrack()
if (state->interleaveSize()
&& stack_.size() < (std::size_t) _sg_mc_max_depth) {
/* We found a back-tracking point, let's loop */
if (state->interleaveSize()
&& stack_.size() < (std::size_t) _sg_mc_max_depth) {
/* We found a back-tracking point, let's loop */
- XBT_DEBUG("Back-tracking to state %d at depth %zi",
- state->num, stack_.size() + 1);
+ XBT_DEBUG("Back-tracking to state %d at depth %zi", state->num, stack_.size() + 1);
stack_.push_back(std::move(state));
this->restoreState();
XBT_DEBUG("Back-tracking to state %d at depth %zi done",
stack_.push_back(std::move(state));
this->restoreState();
XBT_DEBUG("Back-tracking to state %d at depth %zi done",
@@
-306,7
+306,9
@@
SafetyChecker::SafetyChecker(Session& session) : Checker(session)
if (_sg_mc_termination)
XBT_INFO("Check non progressive cycles");
else
if (_sg_mc_termination)
XBT_INFO("Check non progressive cycles");
else
- XBT_INFO("Check a safety property");
+ XBT_INFO("Check a safety property. Reduction is: %s.",
+ (reductionMode_ == simgrid::mc::ReductionMode::none ? "none":
+ (reductionMode_ == simgrid::mc::ReductionMode::dpor ? "dpor": "unknown")));
simgrid::mc::session->initialize();
XBT_DEBUG("Starting the safety algorithm");
simgrid::mc::session->initialize();
XBT_DEBUG("Starting the safety algorithm");
@@
-320,7
+322,7
@@
SafetyChecker::SafetyChecker(Session& session) : Checker(session)
/* Get an enabled actor and insert it in the interleave set of the initial state */
for (auto& actor : mc_model_checker->process().actors())
if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer())) {
/* Get an enabled actor and insert it in the interleave set of the initial state */
for (auto& actor : mc_model_checker->process().actors())
if (simgrid::mc::actor_is_enabled(actor.copy.getBuffer())) {
- initial_state->
interleave
(actor.copy.getBuffer());
+ initial_state->
addInterleavingSet
(actor.copy.getBuffer());
if (reductionMode_ != simgrid::mc::ReductionMode::none)
break;
}
if (reductionMode_ != simgrid::mc::ReductionMode::none)
break;
}
@@
-328,14
+330,10
@@
SafetyChecker::SafetyChecker(Session& session) : Checker(session)
stack_.push_back(std::move(initial_state));
}
stack_.push_back(std::move(initial_state));
}
-SafetyChecker::~SafetyChecker()
-{
-}
-
Checker* createSafetyChecker(Session& session)
{
return new SafetyChecker(session);
}
Checker* createSafetyChecker(Session& session)
{
return new SafetyChecker(session);
}
-
+
}
}
}
}