-/* Copyright (c) 2014-2015. 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/fifo.h>
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
-
-#include "simgrid/simix.h"
-
-#include "src/simix/smx_private.h"
-#include "src/simix/smx_process_private.h"
-
-#include "src/mc/mc_replay.h"
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_base.h"
-
-#if HAVE_MC
-#include "src/mc/mc_request.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_state.h"
-#include "src/mc/mc_smx.h"
-#include "src/mc/LivenessChecker.hpp"
+#include "src/mc/mc_record.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"
+
+#if SIMGRID_HAVE_MC
+#include "src/mc/api/State.hpp"
+#include "src/mc/explo/Exploration.hpp"
+#include "src/mc/mc_private.hpp"
#endif
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
- " Logging specific to MC record/replay facility");
-
-extern "C" {
-char* MC_record_path = nullptr;
-}
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc, "Logging specific to MC record/replay facility");
namespace simgrid {
namespace mc {
-void replay(RecordTrace const& trace)
+void RecordTrace::replay()
{
- simgrid::mc::wait_for_requests();
+ simgrid::mc::execute_actors();
- for (auto& item : trace) {
- XBT_DEBUG("Executing %i$%i", item.pid, item.value);
+ for (simgrid::mc::Transition* const transition : transitions_) {
+ XBT_DEBUG("Executing %ld$%i", transition->aid_, transition->times_considered_);
// Choose a request:
- smx_process_t process = SIMIX_process_from_PID(item.pid);
- if (!process)
- xbt_die("Unexpected process.");
- smx_simcall_t simcall = &(process->simcall);
- if(!simcall || simcall->call == SIMCALL_NONE)
- xbt_die("No simcall for this process.");
- if (!simgrid::mc::request_is_visible(simcall)
- || !simgrid::mc::request_is_enabled(simcall))
- 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, item.value);
- simgrid::mc::wait_for_requests();
+ simcall->issuer_->simcall_handle(transition->times_considered_);
+ simgrid::mc::execute_actors();
}
}
-void replay(const char* path_string)
+void simgrid::mc::RecordTrace::replay(const std::string& path_string)
{
- simgrid::mc::processes_time.resize(simix_process_maxpid);
- simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string);
- simgrid::mc::replay(trace);
+ simgrid::mc::processes_time.resize(simgrid::kernel::actor::get_maxpid());
+ simgrid::mc::RecordTrace trace(path_string.c_str());
+ trace.replay();
+ for (auto* item : trace.transitions_)
+ delete item;
simgrid::mc::processes_time.clear();
}
-RecordTrace parseRecordTrace(const char* data)
+simgrid::mc::RecordTrace::RecordTrace(const char* data)
{
- RecordTrace res;
XBT_INFO("path=%s", data);
- if (!data || !data[0])
- throw std::runtime_error("Could not parse record path");
+ if (data == nullptr || data[0] == '\0')
+ throw std::invalid_argument("Could not parse record path");
const char* current = data;
while (*current) {
+ long aid;
+ int times_considered;
+ int count = sscanf(current, "%ld/%d", &aid, ×_considered);
- simgrid::mc::RecordTraceElement item;
- int count = sscanf(current, "%u/%u", &item.pid, &item.value);
if(count != 2 && count != 1)
- throw std::runtime_error("Could not parse record path");
- res.push_back(item);
+ throw std::invalid_argument("Could not parse record path");
+ push_back(new simgrid::mc::Transition(simgrid::mc::Transition::Type::UNKNOWN, aid, times_considered));
// Find next chunk:
const char* end = std::strchr(current, ';');
else
current = end + 1;
}
-
- return std::move(res);
}
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
-std::string traceToString(simgrid::mc::RecordTrace const& trace)
+std::string simgrid::mc::RecordTrace::to_string() const
{
std::ostringstream stream;
- for (auto i = trace.begin(); i != trace.end(); ++i) {
- if (i != trace.begin())
+ for (auto i = transitions_.begin(); i != transitions_.end(); ++i) {
+ if (i != transitions_.begin())
stream << ';';
- stream << i->pid;
- if (i->value)
- stream << '/' << i->value;
+ 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());
- }
-}
-
#endif
}
