X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3086f8693ca7977af2f666bca46f733046b22996..afd3a47e007a0f91d206cc2e47b69b4b86970fc2:/src/mc/mc_record.cpp diff --git a/src/mc/mc_record.cpp b/src/mc/mc_record.cpp index 2bc655b633..d2c382c78b 100644 --- a/src/mc/mc_record.cpp +++ b/src/mc/mc_record.cpp @@ -17,11 +17,12 @@ #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" @@ -30,7 +31,7 @@ #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, @@ -51,7 +52,7 @@ void replay(RecordTrace const& trace) XBT_DEBUG("Executing %i$%i", transition.pid, transition.argument); // Choose a request: - smx_process_t process = SIMIX_process_from_PID(transition.pid); + smx_actor_t process = SIMIX_process_from_PID(transition.pid); if (!process) xbt_die("Unexpected process."); smx_simcall_t simcall = &(process->simcall); @@ -69,7 +70,7 @@ void replay(RecordTrace const& trace) 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(); @@ -79,7 +80,7 @@ RecordTrace parseRecordTrace(const char* data) { RecordTrace res; XBT_INFO("path=%s", data); - if (!data || !data[0]) + if (data == nullptr || data[0] == '\0') throw std::runtime_error("Could not parse record path"); const char* current = data;