-/* Copyright (c) 2014-2015. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2014-2019. 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/mc/mc_record.hpp"
+#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/context/Context.hpp"
-#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_private.h"
-#include "src/mc/mc_replay.h"
-#include "src/mc/mc_record.h"
-
-#include "src/mc/mc_base.h"
#include "src/mc/Transition.hpp"
-
-#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/Checker.hpp"
+#include "src/mc/mc_base.h"
+#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");
-
-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 {
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.argument_);
// Choose a request:
- smx_process_t process = SIMIX_process_from_PID(transition.pid);
- if (!process)
- xbt_die("Unexpected process.");
+ 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 || simcall->call == SIMCALL_NONE)
- xbt_die("No simcall for this process.");
- if (!simgrid::mc::request_is_visible(simcall)
- || !simgrid::mc::request_is_enabled(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.");
// Execute the request:
- SIMIX_simcall_handle(simcall, transition.argument);
+ simcall->issuer_->simcall_handle(transition.argument_);
simgrid::mc::wait_for_requests();
}
}
-void replay(const char* path_string)
+void replay(const std::string& path_string)
{
- simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
- simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string);
+ 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();
}
RecordTrace res;
XBT_INFO("path=%s", data);
if (data == nullptr || data[0] == '\0')
- throw std::runtime_error("Could not parse record path");
+ throw std::invalid_argument("Could not parse record path");
const char* current = data;
while (*current) {
simgrid::mc::Transition item;
- int count = sscanf(current, "%u/%u", &item.pid, &item.argument);
+ int count = sscanf(current, "%d/%d", &item.pid_, &item.argument_);
if(count != 2 && count != 1)
- throw std::runtime_error("Could not parse record path");
+ throw std::invalid_argument("Could not parse record path");
res.push_back(item);
// Find next chunk:
return res;
}
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
std::string traceToString(simgrid::mc::RecordTrace const& trace)
{
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->argument_)
+ stream << '/' << i->argument_;
}
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