#include <sstream>
#include <string>
-#include <xbt/log.h>
-#include <xbt/sysdep.h>
+#include "xbt/log.h"
+#include "xbt/sysdep.h"
#include "simgrid/simix.h"
+#include "src/kernel/context/Context.hpp"
+#include "src/simix/ActorImpl.hpp"
#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"
#include "src/mc/Transition.hpp"
-#if HAVE_MC
+#if SIMGRID_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/checker/Checker.hpp"
#endif
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_record, mc,
XBT_DEBUG("Executing %i$%i", transition.pid, transition.argument);
// Choose a request:
- smx_process_t process = SIMIX_process_from_PID(transition.pid);
- if (!process)
+ smx_actor_t process = SIMIX_process_from_PID(transition.pid);
+ if (not process)
xbt_die("Unexpected process.");
smx_simcall_t simcall = &(process->simcall);
- if(!simcall || simcall->call == SIMCALL_NONE)
+ if (not 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 (not simgrid::mc::request_is_visible(simcall) || not simgrid::mc::request_is_enabled(simcall))
xbt_die("Unexpected simcall.");
// Execute the request:
void replay(const char* path_string)
{
- simgrid::mc::processes_time.resize(simix_process_maxpid);
+ simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
simgrid::mc::RecordTrace trace = simgrid::mc::parseRecordTrace(path_string);
simgrid::mc::replay(trace);
simgrid::mc::processes_time.clear();
return res;
}
-#if HAVE_MC
+#if SIMGRID_HAVE_MC
std::string traceToString(simgrid::mc::RecordTrace const& trace)
{