-/* 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. */
#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");
++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;
}
}
#endif
-#if HAVE_SANITIZE_ADDRESS
+#if HAVE_SANITIZER_ADDRESS
#include <sanitizer/asan_interface.h>
static void* asan_safe_memcpy(void* dest, void* src, size_t n)
{
#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))
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\