-/* Copyright (c) 2014-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2014-2022. 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
void replay(RecordTrace const& trace)
{
- simgrid::mc::wait_for_requests();
+ simgrid::mc::execute_actors();
for (simgrid::mc::Transition const& transition : trace) {
- XBT_DEBUG("Executing %i$%i", transition.pid_, transition.argument_);
+ XBT_DEBUG("Executing %ld$%i", transition.aid_, 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 (simcall == nullptr || 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))
- xbt_die("Unexpected simcall.");
+ kernel::actor::ActorImpl* actor = kernel::actor::ActorImpl::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_);
+ xbt_assert(simgrid::mc::request_is_visible(simcall) && simgrid::mc::actor_is_enabled(actor), "Unexpected simcall.");
// Execute the request:
- simcall->issuer_->simcall_handle(transition.argument_);
- simgrid::mc::wait_for_requests();
+ simcall->issuer_->simcall_handle(transition.times_considered_);
+ simgrid::mc::execute_actors();
}
}
const char* current = data;
while (*current) {
+ long aid;
+ int times_considered;
+ int count = sscanf(current, "%ld/%d", &aid, ×_considered);
+ simgrid::mc::Transition item(aid, times_considered);
- simgrid::mc::Transition item;
- int count = sscanf(current, "%d/%d", &item.pid_, &item.argument_);
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->aid_;
+ if (i->times_considered_)
+ stream << '/' << i->times_considered_;
}
return stream.str();
}