-/* Copyright (c) 2014-2017. 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 <cstring>
-#include <cstdio>
-#include <cstdlib>
-
-#include <stdexcept>
-#include <sstream>
-#include <string>
-
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
-
-#include "simgrid/simix.h"
-
-#include "src/kernel/context/Context.hpp"
#include "src/mc/mc_record.hpp"
-#include "src/mc/mc_replay.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.hpp"
-
-#include "src/mc/mc_base.h"
+#include "src/kernel/activity/CommImpl.hpp"
+#include "src/kernel/context/Context.hpp"
#include "src/mc/Transition.hpp"
+#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
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
- " Logging specific to MC record/replay facility");
-
-std::string MC_record_path;
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc, "Logging specific to MC record/replay facility");
namespace simgrid {
namespace mc {
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 (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))
- 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:
- SIMIX_simcall_handle(simcall, transition.argument);
- simgrid::mc::wait_for_requests();
+ simcall->issuer_->simcall_handle(transition.times_considered_);
+ simgrid::mc::execute_actors();
}
}
-void replay(std::string path_string)
+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) {
+ 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_ > 0)
+ stream << '/' << i->times_considered_;
}
return stream.str();
}
void dumpRecordPath()
{
- if (MC_record_is_active()) {
- RecordTrace trace = mc_model_checker->getChecker()->getRecordTrace();
- XBT_INFO("Path = %s", traceToString(trace).c_str());
- }
+ RecordTrace trace = mc_model_checker->getChecker()->get_record_trace();
+ XBT_INFO("Path = %s", traceToString(trace).c_str());
}
#endif