X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54c3a9078274046acfa14099061c6fa1a9195723..cfa37467445963796bfdafdec9bad8ec8566a60a:/src/smpi/internals/smpi_memory.cpp diff --git a/src/smpi/internals/smpi_memory.cpp b/src/smpi/internals/smpi_memory.cpp index e633e7ac5f..f11d75912e 100644 --- a/src/smpi/internals/smpi_memory.cpp +++ b/src/smpi/internals/smpi_memory.cpp @@ -3,6 +3,7 @@ /* 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 #include #include #include @@ -23,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"); @@ -33,17 +34,26 @@ int smpi_data_exe_size = 0; SmpiPrivStrategies smpi_privatize_global_variables; static void* smpi_data_exe_copy; +// Initialized by smpi_prepare_global_memory_segment(). +static std::vector initial_vm_map; + // We keep a copy of all the privatization regions: We can then delete everything easily by iterating over this // collection and nothing can be leaked. We could also iterate over all actors but we would have to be diligent when two // actors use the same privatization region (so, smart pointers would have to be used etc.) // Use a std::deque so that pointers remain valid after push_back(). static std::deque smpi_privatization_regions; -static const int PROT_RWX = (PROT_READ | PROT_WRITE | PROT_EXEC); -static const int PROT_RW = (PROT_READ | PROT_WRITE ); -XBT_ATTRIB_UNUSED static const int PROT_RX = (PROT_READ | PROT_EXEC ); +static constexpr int PROT_RWX = PROT_READ | PROT_WRITE | PROT_EXEC; +static constexpr int PROT_RW = PROT_READ | PROT_WRITE; + +/** Take a snapshot of the process' memory map. + */ +void smpi_prepare_global_memory_segment() +{ + initial_vm_map = simgrid::xbt::get_memory_map(getpid()); +} -void smpi_get_executable_global_size() +static void smpi_get_executable_global_size() { char buffer[PATH_MAX]; char* full_name = realpath(xbt_binary_name, buffer); @@ -59,13 +69,17 @@ void smpi_get_executable_global_size() if (i->pathname == full_name && (i->prot & PROT_RWX) == PROT_RW) { smpi_data_exe_start = (char*)i->start_addr; smpi_data_exe_size = i->end_addr - i->start_addr; - ++i; /* Here we are making the assumption that a suitable empty region following the rw- area is the end of the data segment. It would be better to check with the size of the data segment. */ + ++i; if (i != map.end() && i->pathname.empty() && (i->prot & PROT_RWX) == PROT_RW && (char*)i->start_addr == smpi_data_exe_start + smpi_data_exe_size) { - smpi_data_exe_size = (char*)i->end_addr - smpi_data_exe_start; + // Only count this region if it was not already present in the initial map. + auto found = std::find_if(begin(initial_vm_map), end(initial_vm_map), + [&i](const simgrid::xbt::VmMap& m) { return m.start_addr == i->start_addr; }); + if (found == end(initial_vm_map)) + smpi_data_exe_size = (char*)i->end_addr - smpi_data_exe_start; } return; } @@ -74,7 +88,7 @@ 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) { @@ -119,10 +133,9 @@ 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_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, current, 0); + 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)) xbt_die("Couldn't map the new region (errno %d): %s", errno, strerror(errno)); smpi_loaded_page = actor->get_pid(); @@ -142,13 +155,15 @@ int smpi_is_privatization_file(char* file) */ void smpi_backup_global_memory_segment() { - xbt_assert(HAVE_PRIVATIZATION, "You are trying to use privatization on a system that does not support it. Don't."); +#if HAVE_PRIVATIZATION smpi_get_executable_global_size(); + initial_vm_map.clear(); + initial_vm_map.shrink_to_fit(); XBT_DEBUG("bss+data segment found : size %d starting at %p", smpi_data_exe_size, smpi_data_exe_start); if (smpi_data_exe_size == 0) { // no need to do anything as global variables don't exist - smpi_privatize_global_variables = SmpiPrivStrategies::None; + smpi_privatize_global_variables = SmpiPrivStrategies::NONE; return; } @@ -156,6 +171,9 @@ void smpi_backup_global_memory_segment() // Make a copy of the data segment. This clean copy is retained over the whole runtime // of the simulation and can be used to initialize a dynamically added, new process. asan_safe_memcpy(smpi_data_exe_copy, TOPAGE(smpi_data_exe_start), smpi_data_exe_size); +#else /* ! HAVE_PRIVATIZATION */ + xbt_die("You are trying to use privatization on a system that does not support it. Don't."); +#endif } // Initializes the memory mapping for a single process and returns the privatization region @@ -194,7 +212,7 @@ Ask the Internet about tutorials on how to increase the files limit such as: htt xbt_die("Impossible to set the size of the temporary file for memory mapping"); /* Ask for a free region */ - address = mmap(nullptr, smpi_data_exe_size, PROT_READ | PROT_WRITE, MAP_SHARED, file_descriptor, 0); + address = mmap(nullptr, smpi_data_exe_size, PROT_RW, MAP_SHARED, file_descriptor, 0); if (address == MAP_FAILED) xbt_die("Couldn't find a free region for memory mapping"); @@ -225,40 +243,52 @@ void smpi_destroy_global_memory_segments(){ #endif } -static int sendbuffer_size = 0; -static char* sendbuffer = nullptr; -static int recvbuffer_size = 0; -static char* recvbuffer = nullptr; -//allocate a single buffer for all sends, growing it if needed -void* smpi_get_tmp_sendbuffer(int size) +//allocate a single buffer for all sends, and an other of all reads, for each actor. +//buffer size is growing if needed + +typedef std::tuple buffer_tuple; +static std::map sendbuffer_map; +static std::map recvbuffer_map; +static void* smpi_get_tmp_buffer(int size, std::map* buffer_map) { + // Because this kind of process maintain is own list of buffers and call + // `smpi_free_tmp_buffer(void* buf)` to free them if (not smpi_process()->replaying()) return xbt_malloc(size); - if (sendbuffer_size(xbt_realloc(sendbuffer,size)); - sendbuffer_size=size; + + // check if the process is registered + aid_t id = simgrid::s4u::this_actor::get_pid(); + if (buffer_map->find(id) == buffer_map->end()) { + // This tuple represents a buffer and his size + buffer_tuple buffer_tuple(nullptr, 0); + (*buffer_map)[id] = buffer_tuple; + simgrid::s4u::this_actor::on_exit( + [id, buffer_map](int status, void* ignored) { + xbt_free(std::get<0>((*buffer_map)[id])); + std::get<0>((*buffer_map)[id]) = nullptr; + }, + nullptr); } - return sendbuffer; -} -//allocate a single buffer for all recv -void* smpi_get_tmp_recvbuffer(int size){ - if (not smpi_process()->replaying()) - return xbt_malloc(size); - if (recvbuffer_size(xbt_realloc(recvbuffer,size)); - recvbuffer_size=size; + if (std::get<1>((*buffer_map)[id]) < size) { + std::get<0>((*buffer_map)[id]) = xbt_realloc(std::get<0>((*buffer_map)[id]), size); + std::get<1>((*buffer_map)[id]) = size; } - return recvbuffer; + return std::get<0>((*buffer_map)[id]); +} + +void* smpi_get_tmp_sendbuffer(int size) +{ + return smpi_get_tmp_buffer(size, &sendbuffer_map); +} + +void* smpi_get_tmp_recvbuffer(int size) +{ + return smpi_get_tmp_buffer(size, &recvbuffer_map); } void smpi_free_tmp_buffer(void* buf){ if (not smpi_process()->replaying()) xbt_free(buf); } - -void smpi_free_replay_tmp_buffers(){ - xbt_free(sendbuffer); - xbt_free(recvbuffer); -}