#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");
}
#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))
#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 adress*/ void*, /*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)
{
+ // 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<size){
- sendbuffer=static_cast<char*>(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<size){
- recvbuffer=static_cast<char*>(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);
-}