* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/mc/mc_record.hpp"
+#include "src/kernel/EngineImpl.hpp"
#include "src/kernel/activity/CommImpl.hpp"
-#include "src/kernel/context/Context.hpp"
#include "src/mc/mc_base.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/mc/transition/Transition.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc, "Logging specific to MC record/replay facility");
-namespace simgrid {
-namespace mc {
+namespace simgrid::mc {
void RecordTrace::replay() const
{
XBT_DEBUG("Executing %ld$%i", transition->aid_, transition->times_considered_);
// Choose a request:
- kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_pid(transition->aid_);
+ kernel::actor::ActorImpl* actor = kernel::EngineImpl::get_instance()->get_actor_by_pid(transition->aid_);
xbt_assert(actor != nullptr, "Unexpected actor (id:%ld).", transition->aid_);
- const s_smx_simcall* simcall = &(actor->simcall_);
- xbt_assert(simcall->call_ != simix::Simcall::NONE, "No simcall for process %ld.", transition->aid_);
+ const kernel::actor::Simcall* simcall = &(actor->simcall_);
+ xbt_assert(simcall->call_ != kernel::actor::Simcall::Type::NONE, "No simcall for process %ld.", transition->aid_);
xbt_assert(simgrid::mc::request_is_visible(simcall) && simgrid::mc::actor_is_enabled(actor), "Unexpected simcall.");
// Execute the request:
void simgrid::mc::RecordTrace::replay(const std::string& path_string)
{
- simgrid::mc::processes_time.resize(simgrid::kernel::actor::get_maxpid());
+ simgrid::mc::processes_time.resize(kernel::actor::ActorImpl::get_maxpid());
simgrid::mc::RecordTrace trace(path_string.c_str());
trace.replay();
for (auto* item : trace.transitions_)
while (*current) {
long aid;
int times_considered;
- int count = sscanf(current, "%ld/%d", &aid, ×_considered);
- if(count != 2 && count != 1)
+ if (int count = sscanf(current, "%ld/%d", &aid, ×_considered); count != 2 && count != 1)
throw std::invalid_argument("Could not parse record path");
push_back(new simgrid::mc::Transition(simgrid::mc::Transition::Type::UNKNOWN, aid, times_considered));
#endif
-}
-}
+} // namespace simgrid::mc