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
Merge branch 'master' of framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
mc
/
mc_base.cpp
diff --git
a/src/mc/mc_base.cpp
b/src/mc/mc_base.cpp
index c21dc145020a0bec4b675fd44485feb72a8b242f..9791f51e718358eb91b8be544971b193b59aa65d 100644
(file)
--- a/
src/mc/mc_base.cpp
+++ b/
src/mc/mc_base.cpp
@@
-8,17
+8,11
@@
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/actor/SimcallObserver.hpp"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
#include "src/kernel/actor/SimcallObserver.hpp"
+
#include "src/mc/mc.h"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/mc/mc.h"
#include "src/mc/mc_config.hpp"
#include "src/mc/mc_replay.hpp"
-#if SIMGRID_HAVE_MC
-#include "src/mc/ModelChecker.hpp"
-#include "src/mc/api/RemoteApp.hpp"
-#include "src/mc/remote/AppSide.hpp"
-#include "src/mc/sosp/RemoteProcessMemory.hpp"
-#endif
-
XBT_LOG_NEW_DEFAULT_CATEGORY(mc, "All MC categories");
bool simgrid_mc_replay_show_backtraces = false;
XBT_LOG_NEW_DEFAULT_CATEGORY(mc, "All MC categories");
bool simgrid_mc_replay_show_backtraces = false;
@@
-53,10
+47,8
@@
void execute_actors()
*/
bool actor_is_enabled(kernel::actor::ActorImpl* actor)
{
*/
bool actor_is_enabled(kernel::actor::ActorImpl* actor)
{
-#if SIMGRID_HAVE_MC
- xbt_assert(simgrid::mc::model_checking_mode != simgrid::mc::ModelCheckingMode::CHECKER_SIDE,
+ xbt_assert(get_model_checking_mode() != ModelCheckingMode::CHECKER_SIDE,
"This should be called from the client side");
"This should be called from the client side");
-#endif
// Now, we are in the client app, no need for remote memory reading.
kernel::actor::Simcall* req = &actor->simcall_;
// Now, we are in the client app, no need for remote memory reading.
kernel::actor::Simcall* req = &actor->simcall_;
@@
-76,10
+68,9
@@
bool actor_is_enabled(kernel::actor::ActorImpl* actor)
*/
bool request_is_visible(const kernel::actor::Simcall* req)
{
*/
bool request_is_visible(const kernel::actor::Simcall* req)
{
-#if SIMGRID_HAVE_MC
- xbt_assert(simgrid::mc::model_checking_mode != simgrid::mc::ModelCheckingMode::CHECKER_SIDE,
+ xbt_assert(get_model_checking_mode() != ModelCheckingMode::CHECKER_SIDE,
"This should be called from the client side");
"This should be called from the client side");
-#endif
+
if (req->observer_ == nullptr)
return false;
return req->observer_->is_visible();
if (req->observer_ == nullptr)
return false;
return req->observer_->is_visible();