-/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2021. 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. */
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/context/Context.hpp"
#include "src/mc/Transition.hpp"
-#include "src/mc/mc_base.h"
+#include "src/mc/mc_base.hpp"
#include "src/mc/mc_replay.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/checker/Checker.hpp"
#include "src/mc/mc_private.hpp"
#include "src/mc/mc_request.hpp"
-#include "src/mc/mc_smx.hpp"
#include "src/mc/mc_state.hpp"
#endif
simgrid::mc::wait_for_requests();
for (simgrid::mc::Transition const& transition : trace) {
- XBT_DEBUG("Executing %i$%i", transition.pid, transition.argument);
+ XBT_DEBUG("Executing %i$%i", transition.pid_, transition.times_considered_);
// Choose a request:
- smx_actor_t process = SIMIX_process_from_PID(transition.pid);
- if (not process)
- xbt_die("Unexpected process (pid:%d).", transition.pid);
- smx_simcall_t simcall = &(process->simcall);
- if (not simcall || simcall->call == SIMCALL_NONE)
- xbt_die("No simcall for process %d.", transition.pid);
- if (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::actor_is_enabled(process))
+ kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::by_PID(transition.pid_);
+ if (actor == nullptr)
+ xbt_die("Unexpected actor (id:%d).", transition.pid_);
+ const s_smx_simcall* simcall = &(actor->simcall_);
+ if (simcall->call_ == simix::Simcall::NONE)
+ xbt_die("No simcall for process %d.", transition.pid_);
+ if (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::actor_is_enabled(actor))
xbt_die("Unexpected simcall.");
// Execute the request:
- SIMIX_simcall_handle(simcall, transition.argument);
+ simcall->issuer_->simcall_handle(transition.times_considered_);
simgrid::mc::wait_for_requests();
}
}
void replay(const std::string& path_string)
{
- simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
+ simgrid::mc::processes_time.resize(simgrid::kernel::actor::get_maxpid());
simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string.c_str());
simgrid::mc::replay(trace);
simgrid::mc::processes_time.clear();
const char* current = data;
while (*current) {
-
simgrid::mc::Transition item;
- int count = sscanf(current, "%d/%d", &item.pid, &item.argument);
+ int count = sscanf(current, "%d/%d", &item.pid_, &item.times_considered_);
+
if(count != 2 && count != 1)
throw std::invalid_argument("Could not parse record path");
res.push_back(item);
for (auto i = trace.begin(); i != trace.end(); ++i) {
if (i != trace.begin())
stream << ';';
- stream << i->pid;
- if (i->argument)
- stream << '/' << i->argument;
+ stream << i->pid_;
+ if (i->times_considered_)
+ stream << '/' << i->times_considered_;
}
return stream.str();
}