attempt to fix en issue when timing functions are called before initialization

[simgrid.git] / src / smpi / mpi / smpi_group.cpp

diff --git a/src/smpi/mpi/smpi_group.cpp b/src/smpi/mpi/smpi_group.cpp
index 75a499a..e01112f 100644 (file)
--- a/src/smpi/mpi/smpi_group.cpp
+++ b/src/smpi/mpi/smpi_group.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2021. 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. */
@@ -8,8 +8,8 @@
 #include "smpi_comm.hpp"
 #include <string>
 
-simgrid::smpi::Group mpi_MPI_GROUP_EMPTY;
-MPI_Group MPI_GROUP_EMPTY=&mpi_MPI_GROUP_EMPTY;
+simgrid::smpi::Group smpi_MPI_GROUP_EMPTY;
+extern XBT_PRIVATE MPI_Comm MPI_COMM_UNINITIALIZED;
 
 namespace simgrid{
 namespace smpi{
@@ -77,6 +77,8 @@ void Group::unref(Group* group)
 {
   group->refcount_--;
   if (group->refcount_ <= 0) {
+    if (simgrid::smpi::F2C::lookup() != nullptr)
+      F2C::free_f(group->c2f());
     delete group;
   }
 }
@@ -108,16 +110,14 @@ int Group::incl(int n, const int* ranks, MPI_Group* newgroup)
 {
   if (n == 0) {
     *newgroup = MPI_GROUP_EMPTY;
-  } else if (n == size_) {
-    *newgroup = this;
-    if (this != MPI_COMM_WORLD->group() && this != MPI_COMM_SELF->group() && this != MPI_GROUP_EMPTY)
-      this->ref();
   } else {
     *newgroup = new Group(n);
     for (int i = 0; i < n; i++) {
       s4u::Actor* actor = this->actor(ranks[i]); // ranks[] was passed as a param!
       (*newgroup)->set_mapping(actor, i);
     }
+    if((*newgroup)!=MPI_GROUP_EMPTY)
+      (*newgroup)->add_f();
   }
   return MPI_SUCCESS;
 }
@@ -146,6 +146,8 @@ int Group::group_union(MPI_Group group2, MPI_Group* newgroup)
       s4u::Actor* actor = group2->actor(i - size2);
       (*newgroup)->set_mapping(actor, i);
     }
+    if((*newgroup)!=MPI_GROUP_EMPTY)
+      (*newgroup)->add_f();
   }
   return MPI_SUCCESS;
 }
@@ -173,6 +175,8 @@ int Group::intersection(MPI_Group group2, MPI_Group* newgroup)
         j++;
       }
     }
+    if((*newgroup)!=MPI_GROUP_EMPTY)
+      (*newgroup)->add_f();
   }
   return MPI_SUCCESS;
 }
@@ -199,6 +203,8 @@ int Group::difference(MPI_Group group2, MPI_Group* newgroup)
         (*newgroup)->set_mapping(actor, i);
       }
     }
+    if((*newgroup)!=MPI_GROUP_EMPTY)
+      (*newgroup)->add_f();
   }
   return MPI_SUCCESS;
 }
@@ -218,97 +224,64 @@ int Group::excl(int n, const int *ranks, MPI_Group * newgroup){
       j++;
     }
   }
+  if((*newgroup)!=MPI_GROUP_EMPTY)
+    (*newgroup)->add_f();
   return MPI_SUCCESS;
 }
 
 static bool is_rank_in_range(int rank, int first, int last)
 {
-  if (first < last)
-    return rank <= last;
-  else
-    return rank >= last;
+  return (first <= rank && rank <= last) || (first >= rank && rank >= last);
 }
 
-int Group::range_incl(int n, int ranges[][3], MPI_Group * newgroup){
-  int newsize = 0;
-  for (int i = 0; i < n; i++) {
-    for (int rank = ranges[i][0];                    /* First */
-         rank >= 0 && rank < size_; /* Last */
-         ) {
-      newsize++;
-      if(rank == ranges[i][1]){/*already last ?*/
-        break;
-      }
-      rank += ranges[i][2]; /* Stride */
-      if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1]))
-        break;
-    }
-  }
-  *newgroup = new  Group(newsize);
-  int j     = 0;
-  for (int i = 0; i < n; i++) {
-    for (int rank = ranges[i][0];                    /* First */
-         rank >= 0 && rank < size_; /* Last */
-         ) {
-      s4u::Actor* actor = this->actor(rank);
-      (*newgroup)->set_mapping(actor, j);
-      j++;
-      if(rank == ranges[i][1]){/*already last ?*/
-        break;
-      }
-      rank += ranges[i][2]; /* Stride */
-      if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1]))
-        break;
-    }
+int Group::range_incl(int n, int ranges[][3], MPI_Group* newgroup)
+{
+  std::vector<int> to_incl;
+  for (int i = 0; i < n; i++)
+    for (int j = ranges[i][0]; j >= 0 && j < size_ && is_rank_in_range(j, ranges[i][0], ranges[i][1]);
+         j += ranges[i][2])
+      to_incl.push_back(j);
+
+  int newsize = static_cast<int>(to_incl.size());
+  *newgroup   = new Group(newsize);
+
+  for (int j = 0; j < newsize; j++) {
+    int rank          = to_incl[j];
+    s4u::Actor* actor = this->actor(rank);
+    (*newgroup)->set_mapping(actor, j);
   }
+  if((*newgroup)!=MPI_GROUP_EMPTY)
+    (*newgroup)->add_f();
   return MPI_SUCCESS;
 }
 
-int Group::range_excl(int n, int ranges[][3], MPI_Group * newgroup){
+int Group::range_excl(int n, int ranges[][3], MPI_Group* newgroup)
+{
+  std::vector<bool> to_excl(size_, false);
   int newsize = size_;
   for (int i = 0; i < n; i++) {
-    for (int rank = ranges[i][0];                    /* First */
-         rank >= 0 && rank < size_; /* Last */
-         ) {
+    for (int j = ranges[i][0]; j >= 0 && j < size_ && is_rank_in_range(j, ranges[i][0], ranges[i][1]);
+         j += ranges[i][2]) {
+      to_excl[j] = true;
       newsize--;
-      if(rank == ranges[i][1]){/*already last ?*/
-        break;
-      }
-      rank += ranges[i][2]; /* Stride */
-      if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1]))
-        break;
     }
   }
   if (newsize == 0) {
     *newgroup = MPI_GROUP_EMPTY;
   } else {
-    *newgroup = new  Group(newsize);
-    int newrank = 0;
-    int oldrank = 0;
-    while (newrank < newsize) {
-      int add = 1;
-      for (int i = 0; i < n; i++) {
-        for (int rank = ranges[i][0]; rank >= 0 && rank < size_;) {
-          if(rank==oldrank){
-            add = 0;
-            break;
-          }
-          if(rank == ranges[i][1]){/*already last ?*/
-            break;
-          }
-          rank += ranges[i][2]; /* Stride */
-          if (not is_rank_in_range(rank, ranges[i][0], ranges[i][1]))
-            break;
-        }
-      }
-      if(add==1){
-        s4u::Actor* actor = this->actor(oldrank);
-        (*newgroup)->set_mapping(actor, newrank);
-        newrank++;
+    *newgroup = new Group(newsize);
+
+    int j = 0;
+    for (int rank = 0; rank < size_; rank++) {
+      if (not to_excl[rank]) {
+        s4u::Actor* actor = this->actor(rank);
+        (*newgroup)->set_mapping(actor, j);
+        j++;
       }
-      oldrank++;
     }
   }
+  if((*newgroup)!=MPI_GROUP_EMPTY)
+    (*newgroup)->add_f();
   return MPI_SUCCESS;
 }