X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15e20854c41119eb6c28a5c60eee7df325ad20de..dac4b13fbd1be3d7759769d44654622c43abb74c:/src/smpi/mpi/smpi_comm.cpp

diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp
index 67dee29052..1ecccf4610 100644
--- a/src/smpi/mpi/smpi_comm.cpp
+++ b/src/smpi/mpi/smpi_comm.cpp
@@ -28,7 +28,7 @@ namespace smpi{
 std::unordered_map<int, smpi_key_elem> Comm::keyvals_;
 int Comm::keyval_id_=0;
 
-Comm::Comm(MPI_Group group, MPI_Topology topo, int smp) : group_(group), topo_(topo),is_smp_comm_(smp)
+Comm::Comm(MPI_Group group, MPI_Topology topo, int smp, int in_id) : group_(group), topo_(topo),is_smp_comm_(smp), id_(in_id)
 {
   refcount_        = 1;
   topoType_        = MPI_INVALID_TOPO;
@@ -38,6 +38,21 @@ Comm::Comm(MPI_Group group, MPI_Topology topo, int smp) : group_(group), topo_(t
   non_uniform_map_ = nullptr;
   leaders_map_     = nullptr;
   is_blocked_      = 0;
+  info_            = MPI_INFO_NULL;
+  errhandler_      = MPI_ERRORS_ARE_FATAL;
+  static int global_id_=0;
+  //First creation of comm is done before SIMIX_run, so only do comms for others
+  if(in_id==MPI_UNDEFINED && smp==0 && this->rank()!=MPI_UNDEFINED ){
+    int id;
+    if(this->rank()==0){
+      id=global_id_;
+      global_id_++;
+    }
+    Colls::bcast(&id, 1, MPI_INT, 0, this);
+    XBT_DEBUG("Communicator %p has id %d", this, id);
+    id_=id;//only set here, as we don't want to change it in the middle of the bcast
+    Colls::barrier(this);
+  }
 }
 
 void Comm::destroy(Comm* comm)
@@ -89,6 +104,25 @@ int Comm::dup(MPI_Comm* newcomm){
       }
     }
   }
+  //duplicate info if present
+  if(info_!=MPI_INFO_NULL)
+    (*newcomm)->info_ = new simgrid::smpi::Info(info_);
+  //duplicate errhandler
+  (*newcomm)->set_errhandler(errhandler_);
+  return ret;
+}
+
+int Comm::dup_with_info(MPI_Info info, MPI_Comm* newcomm){
+  int ret = dup(newcomm);
+  if(ret != MPI_SUCCESS)
+    return ret;
+  if((*newcomm)->info_!=MPI_INFO_NULL){
+    simgrid::smpi::Info::unref((*newcomm)->info_);
+    (*newcomm)->info_=MPI_INFO_NULL;
+  }
+  if(info != MPI_INFO_NULL){
+    (*newcomm)->info_=info;
+  }
   return ret;
 }
 
@@ -113,6 +147,11 @@ int Comm::rank()
   return group_->rank(s4u::Actor::self());
 }
 
+int Comm::id()
+{
+  return id_;
+}
+
 void Comm::get_name (char* name, int* len)
 {
   if (this == MPI_COMM_UNINITIALIZED){
@@ -194,7 +233,7 @@ MPI_Comm Comm::split(int color, int key)
 {
   if (this == MPI_COMM_UNINITIALIZED)
     return smpi_process()->comm_world()->split(color, key);
-  int system_tag = 123;
+  int system_tag = -123;
   int* recvbuf;
 
   MPI_Group group_root = nullptr;
@@ -299,27 +338,7 @@ void Comm::unref(Comm* comm){
   }
 }
 
-void Comm::init_smp(){
-  int leader = -1;
-
-  if (this == MPI_COMM_UNINITIALIZED)
-    smpi_process()->comm_world()->init_smp();
-
-  int comm_size = this->size();
-
-  // If we are in replay - perform an ugly hack
-  // tell SimGrid we are not in replay for a while, because we need the buffers to be copied for the following calls
-  bool replaying = false; //cache data to set it back again after
-  if(smpi_process()->replaying()){
-    replaying = true;
-    smpi_process()->set_replaying(false);
-  }
-
-  if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
-    // we need to switch as the called function may silently touch global variables
-    smpi_switch_data_segment(s4u::Actor::self());
-  }
-  //identify neighbours in comm
+MPI_Comm Comm::find_intra_comm(int * leader){
   //get the indices of all processes sharing the same simix host
   auto& process_list      = sg_host_self()->pimpl_->process_list_;
   int intra_comm_size     = 0;
@@ -341,9 +360,33 @@ void Comm::init_smp(){
       i++;
     }
   }
+  *leader=min_index;
+  return new  Comm(group_intra, nullptr, 1);
+}
+
+void Comm::init_smp(){
+  int leader = -1;
+  int i = 0;
+  if (this == MPI_COMM_UNINITIALIZED)
+    smpi_process()->comm_world()->init_smp();
+
+  int comm_size = this->size();
+
+  // If we are in replay - perform an ugly hack
+  // tell SimGrid we are not in replay for a while, because we need the buffers to be copied for the following calls
+  bool replaying = false; //cache data to set it back again after
+  if(smpi_process()->replaying()){
+    replaying = true;
+    smpi_process()->set_replaying(false);
+  }
+
+  if (smpi_privatize_global_variables == SmpiPrivStrategies::MMAP) {
+    // we need to switch as the called function may silently touch global variables
+    smpi_switch_data_segment(s4u::Actor::self());
+  }
+  //identify neighbours in comm
+  MPI_Comm comm_intra = find_intra_comm(&leader);
 
-  MPI_Comm comm_intra = new  Comm(group_intra, nullptr, 1);
-  leader=min_index;
 
   int* leaders_map = new int[comm_size];
   int* leader_list = new int[comm_size];
@@ -465,7 +508,7 @@ MPI_Comm Comm::f2c(int id) {
   } else if(F2C::f2c_lookup() != nullptr && id >= 0) {
     char key[KEY_SIZE];
     const auto& lookup = F2C::f2c_lookup();
-    auto comm          = lookup->find(get_key_id(key, id));
+    auto comm          = lookup->find(get_key(key, id));
     return comm == lookup->end() ? MPI_COMM_NULL : static_cast<MPI_Comm>(comm->second);
   } else {
     return MPI_COMM_NULL;
@@ -474,17 +517,7 @@ MPI_Comm Comm::f2c(int id) {
 
 void Comm::free_f(int id) {
   char key[KEY_SIZE];
-  F2C::f2c_lookup()->erase(id == 0 ? get_key(key, id) : get_key_id(key, id));
-}
-
-int Comm::add_f() {
-  if(F2C::f2c_lookup()==nullptr){
-    F2C::set_f2c_lookup(new std::unordered_map<std::string, F2C*>);
-  }
-  char key[KEY_SIZE];
-  (*(F2C::f2c_lookup()))[this == MPI_COMM_WORLD ? get_key(key, F2C::f2c_id()) : get_key_id(key, F2C::f2c_id())] = this;
-  f2c_id_increment();
-  return F2C::f2c_id()-1;
+  F2C::f2c_lookup()->erase(get_key(key, id));
 }
 
 void Comm::add_rma_win(MPI_Win win){
@@ -517,15 +550,30 @@ void Comm::set_info(MPI_Info info){
   info_=info;
 }
 
+MPI_Errhandler Comm::errhandler(){
+  return errhandler_;
+}
+
+void Comm::set_errhandler(MPI_Errhandler errhandler){
+  errhandler_=errhandler;
+  if(errhandler_!= MPI_ERRHANDLER_NULL)
+    errhandler->ref();
+}
+
 MPI_Comm Comm::split_type(int type, int /*key*/, MPI_Info)
 {
-  if(type != MPI_COMM_TYPE_SHARED){
+  //MPI_UNDEFINED can be given to some nodes... but we need them to still perform the smp part which is collective
+  if(type != MPI_COMM_TYPE_SHARED && type != MPI_UNDEFINED){
+    return MPI_COMM_NULL;
+  }
+  int leader=0;
+  MPI_Comm res= this->find_intra_comm(&leader);
+  if(type != MPI_UNDEFINED)
+    return res;
+  else{
+    Comm::destroy(res);
     return MPI_COMM_NULL;
   }
-  this->init_smp();
-  this->ref();
-  this->get_intra_comm()->ref();
-  return this->get_intra_comm();
 }
 
 } // namespace smpi