From: Tom Cornebize <tom.cornebize@ensimag.grenoble-inp.fr>
Date: Fri, 7 Apr 2017 14:33:02 +0000 (+0200)
Subject: Take the intersection of the private blocks instead of the union.
X-Git-Tag: v3.16~353^2~1^2~5
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/d9487a95cf3b33b9cce3a15de6f3f712f894f8f8?hp=4343434e9890543bac24758d71340c0b2d1ac7d9;ds=sidebyside

Take the intersection of the private blocks instead of the union.
---

diff --git a/src/smpi/smpi_shared.cpp b/src/smpi/smpi_shared.cpp
index e4f5491209..aa61be5490 100644
--- a/src/smpi/smpi_shared.cpp
+++ b/src/smpi/smpi_shared.cpp
@@ -375,35 +375,26 @@ std::vector<std::pair<int, int>> shift_and_frame_private_blocks(const std::vecto
     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 ++;
+    if(src[i_src].second <= dst[i_dst].first) {
+        i_src++;
     }
-    else {
-      block = dst[i_dst];
-      i_dst ++;
+    else if(dst[i_dst].second <= src[i_src].first) {
+        i_dst++;
+    }
+    else { // src.second > dst.first && dst.second > src.first → the blocks are overlapping
+      block = std::make_pair(std::max(src[i_src].first, dst[i_dst].first),
+                             std::min(src[i_src].second, dst[i_dst].second));
+      result.push_back(block);
+      if(src[i_src].second < dst[i_dst].second)
+          i_src ++;
+      else
+          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;
 }