-/* 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. */
++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;
}
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\
#endif
}
+static std::vector<unsigned char> sendbuffer;
+static std::vector<unsigned char> recvbuffer;
-//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 adress*/ char*, /*buffer size*/ int> buffer_tuple;
-static std::map<aid_t, buffer_tuple> sendbuffer_map;
-static std::map<aid_t, buffer_tuple> recvbuffer_map;
-static void* smpi_get_tmp_buffer(int size, std::map<aid_t, buffer_tuple> buffer_map)
+//allocate a single buffer for all sends, growing it if needed
+void* smpi_get_tmp_sendbuffer(size_t size)
{
- // 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);
-
- // check if the process is registered
- aid_t id = simgrid::s4u::this_actor::get_pid();
- if (not (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;
- }
- if (std::get<1>(buffer_map[id]) < size){
- std::get<0>(buffer_map[id]) = static_cast<char*>(xbt_realloc(std::get<0>(buffer_map[id]), size));
- std::get<1>(buffer_map[id]) = size;
- }
- return std::get<0>(buffer_map[id]);
+ 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();
}
-void* smpi_get_tmp_sendbuffer(int size)
+//allocate a single buffer for all recv
+void* smpi_get_tmp_recvbuffer(size_t size)
{
- return smpi_get_tmp_buffer(size, sendbuffer_map);
+ if (not smpi_process()->replaying())
+ return new unsigned char[size];
+ if (recvbuffer.size() < size)
+ recvbuffer.resize(size);
+ return recvbuffer.data();
}
-void* smpi_get_tmp_recvbuffer(int size)
+void smpi_free_tmp_buffer(const void* buf)
{
- return smpi_get_tmp_buffer(size, recvbuffer_map);
-}
-
-void smpi_free_tmp_buffer(void* buf){
if (not smpi_process()->replaying())
- xbt_free(buf);
+ delete[] static_cast<const unsigned char*>(buf);
}
-void smpi_free_replay_tmp_buffers(){
- aid_t id = simgrid::s4u::this_actor::get_pid();
- xbt_free(std::get<0>(recvbuffer_map[id]));
- xbt_free(std::get<0>(sendbuffer_map[id]));
+void smpi_free_replay_tmp_buffers()
+{
+ std::vector<unsigned char>().swap(sendbuffer);
+ std::vector<unsigned char>().swap(recvbuffer);
}
