X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/64cfda658ffbc436445589f1a7a9afce2e41fb5a..5eeb3c843b60e9ba5e1a952ffe83df2a4d8f5fa0:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index c1968fc35a..063e6956a5 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -3,20 +3,19 @@ /* 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. */ -#include - -#include "mc/mc.h" #include "src/mc/mc_base.h" +#include "mc/mc.h" +#include "simgrid/config.h" +#include "src/kernel/activity/CommImpl.hpp" +#include "src/kernel/activity/MutexImpl.hpp" #include "src/mc/mc_config.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/mc_replay.hpp" -#include "src/mc/remote/RemoteClient.hpp" #include "src/simix/smx_private.hpp" -#include "src/kernel/activity/MutexImpl.hpp" - #if SIMGRID_HAVE_MC #include "src/mc/ModelChecker.hpp" +#include "src/mc/remote/RemoteClient.hpp" using simgrid::mc::remote; #endif @@ -73,7 +72,7 @@ bool actor_is_enabled(smx_actor_t actor) #if SIMGRID_HAVE_MC // If in the MCer, ask the client app since it has all the data if (mc_model_checker != nullptr) { - return mc_model_checker->process().actor_is_enabled(actor->pid); + return mc_model_checker->process().actor_is_enabled(actor->pid_); } #endif @@ -116,7 +115,7 @@ bool actor_is_enabled(smx_actor_t actor) if (mutex->owner == nullptr) return true; - return mutex->owner->pid == req->issuer->pid; + return mutex->owner->pid_ == req->issuer->pid_; } case SIMCALL_SEM_ACQUIRE: {