X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6371a022a209c56be6442c83aa80a267fa4632d7..b16e6e644a2b398d2618a70c1b2f49c94c65d73c:/src/smpi/smpi_shared.cpp

diff --git a/src/smpi/smpi_shared.cpp b/src/smpi/smpi_shared.cpp
index c5208ce31c..e629da93ea 100644
--- a/src/smpi/smpi_shared.cpp
+++ b/src/smpi/smpi_shared.cpp
@@ -114,6 +114,7 @@ typedef std::unordered_map<smpi_source_location, shared_data_t>::value_type shar
 
 typedef struct {
   size_t size;
+  std::vector<std::pair<int, int>> private_blocks;
   shared_data_key_type* data;
 } shared_metadata_t;
 
@@ -240,6 +241,9 @@ void *smpi_shared_malloc_global__(size_t size, const char *file, int line, int *
     xbt_assert(0 <= start_offset,          "start_offset (%d) should be greater than 0", start_offset);
     xbt_assert(start_offset < stop_offset, "start_offset (%d) should be lower than stop offset (%d)", start_offset, stop_offset);
     xbt_assert(stop_offset <= size,         "stop_offset (%d) should be lower than size (%lu)", stop_offset, size);
+    if(i_block < nb_shared_blocks-1)
+      xbt_assert(stop_offset < shared_block_offsets[2*i_block+2],
+              "stop_offset (%d) should be lower than its successor start offset (%d)", stop_offset, shared_block_offsets[2*i_block+2]);
 //    fprintf(stderr, "shared block 0x%x - 0x%x\n", start_offset, stop_offset);
     int start_block_offset = ALIGN_UP(start_offset, smpi_shared_malloc_blocksize);
     int stop_block_offset = ALIGN_DOWN(stop_offset, smpi_shared_malloc_blocksize);
@@ -281,16 +285,24 @@ void *smpi_shared_malloc_global__(size_t size, const char *file, int line, int *
     }
   }
 
-  if(nb_shared_blocks == 1 && shared_block_offsets[0] == 0 && shared_block_offsets[1] == size) {
-    shared_metadata_t newmeta;
-    //register metadata for memcpy avoidance
-    shared_data_key_type* data = (shared_data_key_type*)xbt_malloc(sizeof(shared_data_key_type));
-    data->second.fd = -1;
-    data->second.count = 1;
-    newmeta.size = size;
-    newmeta.data = data;
-    allocs_metadata[mem] = newmeta;
+  shared_metadata_t newmeta;
+  //register metadata for memcpy avoidance
+  shared_data_key_type* data = (shared_data_key_type*)xbt_malloc(sizeof(shared_data_key_type));
+  data->second.fd = -1;
+  data->second.count = 1;
+  newmeta.size = size;
+  newmeta.data = data;
+  if(shared_block_offsets[0] > 0) {
+    newmeta.private_blocks.push_back(std::make_pair(0, shared_block_offsets[0]));
+  }
+  int i_block;
+  for(i_block = 0; i_block < nb_shared_blocks-1; i_block ++) {
+    newmeta.private_blocks.push_back(std::make_pair(shared_block_offsets[2*i_block+1], shared_block_offsets[2*i_block+2]));
+  }
+  if(shared_block_offsets[2*i_block+1] < size) {
+    newmeta.private_blocks.push_back(std::make_pair(shared_block_offsets[2*i_block+1], size));
   }
+  allocs_metadata[mem] = newmeta;
 
   return mem;
 }
@@ -326,24 +338,75 @@ void *smpi_shared_malloc(size_t size, const char *file, int line) {
   return mem;
 }
 
-int smpi_is_shared(void* ptr){
+int smpi_is_shared(void* ptr, std::vector<std::pair<int, int>> &private_blocks, int *offset){
+  private_blocks.clear(); // being paranoid
   if (allocs_metadata.empty())
     return 0;
   if ( smpi_cfg_shared_malloc == shmalloc_local || smpi_cfg_shared_malloc == shmalloc_global) {
     auto low = allocs_metadata.lower_bound(ptr);
-    if (low->first==ptr)
+    if (low->first==ptr) {
+      private_blocks = low->second.private_blocks;
+      *offset = 0;
       return 1;
+    }
     if (low == allocs_metadata.begin())
       return 0;
     low --;
-    if (ptr < (char*)low->first + low->second.size)
+    if (ptr < (char*)low->first + low->second.size) {
+      xbt_assert(ptr > (char*)low->first, "Oops, there seems to be a bug in the shared memory metadata.");
+      *offset = ((uint8_t*)ptr) - ((uint8_t*) low->first);
+      private_blocks = low->second.private_blocks;
       return 1;
+    }
     return 0;
   } else {
     return 0;
   }
 }
 
+std::vector<std::pair<int, int>> shift_private_blocks(const std::vector<std::pair<int, int>> vec, int offset) {
+  std::vector<std::pair<int, int>> result;
+  for(auto block: vec) {
+    auto new_block = std::make_pair(std::max(0, block.first-offset), std::max(0, block.second-offset));
+    if(new_block.second > 0)
+      result.push_back(new_block);
+  }
+  return result;
+}
+
+void append_or_merge_block(std::vector<std::pair<int, int>> &vec, std::pair<int, int> &block) {
+  if(vec.size() > 0 && block.first <= vec.back().second) { // overlapping with the last block inserted
+    vec.back().second = std::max(vec.back().second, block.second);
+  }
+  else { // not overlapping, we insert a new block
+    vec.push_back(block);
+  }
+}
+
+std::vector<std::pair<int, int>> merge_private_blocks(std::vector<std::pair<int, int>> src, std::vector<std::pair<int, int>> dst) {
+  std::vector<std::pair<int, int>> result;
+  unsigned i_src=0, i_dst=0;
+  while(i_src < src.size() && i_dst < dst.size()) {
+    std::pair<int, int> block;
+    if(src[i_src].first < dst[i_dst].first) {
+      block = src[i_src];
+      i_src ++;
+    }
+    else {
+      block = dst[i_dst];
+      i_dst ++;
+    }
+    append_or_merge_block(result, block);
+  }
+  for(; i_src < src.size(); i_src++) {
+    append_or_merge_block(result, src[i_src]);
+  }
+  for(; i_dst < dst.size(); i_dst++) {
+    append_or_merge_block(result, dst[i_dst]);
+  }
+  return result;
+}
+
 void smpi_shared_free(void *ptr)
 {
   if (smpi_cfg_shared_malloc == shmalloc_local) {