X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50090c76b8e07ae21ae00b9f7698b54cd54614e2..cbd8dae6d524fc62b0fb5fcf7b2604e98f953615:/src/smpi/internals/smpi_memory.cpp diff --git a/src/smpi/internals/smpi_memory.cpp b/src/smpi/internals/smpi_memory.cpp index 3a8f7e98a0..b09a4f45ec 100644 --- a/src/smpi/internals/smpi_memory.cpp +++ b/src/smpi/internals/smpi_memory.cpp @@ -24,7 +24,7 @@ #include "src/xbt/memory_map.hpp" #include "private.hpp" -#include "smpi_process.hpp" +#include "src/smpi/include/smpi_actor.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_memory, smpi, "Memory layout support for SMPI"); @@ -88,7 +88,7 @@ static void smpi_get_executable_global_size() } #endif -#if HAVE_SANITIZE_ADDRESS +#if HAVE_SANITIZER_ADDRESS #include static void* asan_safe_memcpy(void* dest, void* src, size_t n) { @@ -133,7 +133,7 @@ void smpi_really_switch_data_segment(simgrid::s4u::ActorPtr actor) #if HAVE_PRIVATIZATION // FIXME, cross-process support (mmap across process when necessary) XBT_DEBUG("Switching data frame to the one of process %ld", actor->get_pid()); - simgrid::smpi::Process* process = smpi_process_remote(actor); + simgrid::smpi::ActorExt* process = smpi_process_remote(actor); int current = process->privatized_region()->file_descriptor; void* tmp = mmap(TOPAGE(smpi_data_exe_start), smpi_data_exe_size, PROT_RW, MAP_FIXED | MAP_SHARED, current, 0); if (tmp != TOPAGE(smpi_data_exe_start))