X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/181e4cad04ba9505a583f0788e0849ba963f510f..119aa62dc665f930d8789df44c4a12da471837ed:/src/smpi/internals/smpi_memory.cpp diff --git a/src/smpi/internals/smpi_memory.cpp b/src/smpi/internals/smpi_memory.cpp index d469b16a59..5b927e8fd2 100644 --- a/src/smpi/internals/smpi_memory.cpp +++ b/src/smpi/internals/smpi_memory.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-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. */ @@ -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"); @@ -75,11 +75,12 @@ static void smpi_get_executable_global_size() ++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) { - // 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; + // Only count the portion of this region not present in the initial map. + auto found = std::find_if(initial_vm_map.begin(), initial_vm_map.end(), [&i](const simgrid::xbt::VmMap& m) { + return i->start_addr <= m.start_addr && m.start_addr < i->end_addr; + }); + auto end_addr = (found == initial_vm_map.end() ? i->end_addr : found->start_addr); + smpi_data_exe_size = (char*)end_addr - smpi_data_exe_start; } return; } @@ -88,7 +89,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 +134,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)) @@ -142,12 +143,6 @@ void smpi_really_switch_data_segment(simgrid::s4u::ActorPtr actor) #endif } -int smpi_is_privatization_file(char* file) -{ - const std::string buffer_path("/dev/shm/my-buffer-"); - return buffer_path.compare(0, std::string::npos, file, buffer_path.length()) == 0; -} - /** * @brief Makes a backup of the segment in memory that stores the global variables of a process. * This backup is then used to initialize the global variables for every single @@ -155,7 +150,7 @@ 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(); @@ -163,7 +158,7 @@ void smpi_backup_global_memory_segment() 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; } @@ -171,6 +166,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 @@ -181,10 +179,16 @@ smpi_privatization_region_t smpi_init_global_memory_segment_process() char path[24]; int status; - do { - snprintf(path, sizeof(path), "/smpi-buffer-%06x", rand() % 0xffffffU); + constexpr unsigned VAL_MASK = 0xffffffU; + static unsigned prev_val = VAL_MASK; + for (unsigned i = (prev_val + 1) & VAL_MASK; i != prev_val; i = (i + 1) & VAL_MASK) { + snprintf(path, sizeof(path), "/smpi-buffer-%06x", i); file_descriptor = shm_open(path, O_RDWR | O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); - } while (file_descriptor == -1 && errno == EEXIST); + if (file_descriptor != -1 || errno != EEXIST) { + prev_val = i; + break; + } + } if (file_descriptor < 0) { if (errno == EMFILE) { xbt_die("Impossible to create temporary file for memory mapping: %s\n\ @@ -240,40 +244,39 @@ 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; +static std::vector sendbuffer; +static std::vector recvbuffer; //allocate a single buffer for all sends, growing it if needed -void* smpi_get_tmp_sendbuffer(int size) +unsigned char* smpi_get_tmp_sendbuffer(size_t size) { if (not smpi_process()->replaying()) - return xbt_malloc(size); - if (sendbuffer_size(xbt_realloc(sendbuffer,size)); - sendbuffer_size=size; - } - return sendbuffer; + return new unsigned char[size]; + // FIXME: a resize() may invalidate a previous pointer. Maybe we need to handle a queue of buffers with a reference + // counter. The same holds for smpi_get_tmp_recvbuffer. + if (sendbuffer.size() < size) + sendbuffer.resize(size); + return sendbuffer.data(); } //allocate a single buffer for all recv -void* smpi_get_tmp_recvbuffer(int size){ +unsigned char* smpi_get_tmp_recvbuffer(size_t size) +{ if (not smpi_process()->replaying()) - return xbt_malloc(size); - if (recvbuffer_size(xbt_realloc(recvbuffer,size)); - recvbuffer_size=size; - } - return recvbuffer; + return new unsigned char[size]; + if (recvbuffer.size() < size) + recvbuffer.resize(size); + return recvbuffer.data(); } -void smpi_free_tmp_buffer(void* buf){ +void smpi_free_tmp_buffer(const unsigned char* buf) +{ if (not smpi_process()->replaying()) - xbt_free(buf); + delete[] buf; } -void smpi_free_replay_tmp_buffers(){ - xbt_free(sendbuffer); - xbt_free(recvbuffer); +void smpi_free_replay_tmp_buffers() +{ + std::vector().swap(sendbuffer); + std::vector().swap(recvbuffer); }