smpi: fix issue with message IDs. In case of persistent request reused multiple times...

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

diff --git a/src/smpi/mpi/smpi_comm.cpp b/src/smpi/mpi/smpi_comm.cpp
index 84f604d..ba3cf81 100644 (file)
--- a/src/smpi/mpi/smpi_comm.cpp
+++ b/src/smpi/mpi/smpi_comm.cpp
@@ -1,16 +1,17 @@
-/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2023. 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. */
 
 #include "smpi_comm.hpp"
+#include "simgrid/host.h"
 #include "smpi_coll.hpp"
 #include "smpi_datatype.hpp"
+#include "smpi_info.hpp"
 #include "smpi_request.hpp"
 #include "smpi_win.hpp"
-#include "smpi_info.hpp"
+#include "src/kernel/resource/HostImpl.hpp"
 #include "src/smpi/include/smpi_actor.hpp"
-#include "src/surf/HostImpl.hpp"
 
 #include <limits>
 
@@ -32,8 +33,7 @@ MPI_Comm MPI_COMM_WORLD = MPI_COMM_UNINITIALIZED;
 /* Support for cartesian topology was added, but there are 2 other types of topology, graph et dist graph. In order to
  * support them, we have to add a field SMPI_Topo_type, and replace the MPI_Topology field by an union. */
 
-namespace simgrid{
-namespace smpi{
+namespace simgrid::smpi {
 
 std::unordered_map<int, smpi_key_elem> Comm::keyvals_;
 int Comm::keyval_id_=0;
@@ -55,7 +55,6 @@ Comm::Comm(MPI_Group group, MPI_Topology topo, bool smp, int in_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);
   }
 }
 
@@ -79,27 +78,27 @@ int Comm::dup(MPI_Comm* newcomm){
   auto* cp     = new Group(this->group());
   (*newcomm)   = new  Comm(cp, this->topo());
 
-  for (auto const& it : attributes()) {
-    auto elem_it = keyvals_.find(it.first);
-    xbt_assert(elem_it != keyvals_.end(), "Keyval not found for Comm: %d", it.first);
+  for (auto const& [key, value] : attributes()) {
+    auto elem_it = keyvals_.find(key);
+    xbt_assert(elem_it != keyvals_.end(), "Keyval not found for Comm: %d", key);
 
     smpi_key_elem& elem = elem_it->second;
     int ret             = MPI_SUCCESS;
     int flag            = 0;
     void* value_out     = nullptr;
     if (elem.copy_fn.comm_copy_fn == MPI_COMM_DUP_FN) {
-      value_out = it.second;
+      value_out = value;
       flag      = 1;
     } else if (elem.copy_fn.comm_copy_fn != MPI_NULL_COPY_FN) {
-      ret = elem.copy_fn.comm_copy_fn(this, it.first, elem.extra_state, it.second, &value_out, &flag);
+      ret = elem.copy_fn.comm_copy_fn(this, key, elem.extra_state, value, &value_out, &flag);
     }
     if (elem.copy_fn.comm_copy_fn_fort != MPI_NULL_COPY_FN) {
       value_out = xbt_new(int, 1);
       if (*(int*)*elem.copy_fn.comm_copy_fn_fort == 1) { // MPI_COMM_DUP_FN
-        memcpy(value_out, it.second, sizeof(int));
+        memcpy(value_out, value, sizeof(int));
         flag = 1;
       } else { // not null, nor dup
-        elem.copy_fn.comm_copy_fn_fort(this, it.first, elem.extra_state, it.second, value_out, &flag, &ret);
+        elem.copy_fn.comm_copy_fn_fort(this, key, elem.extra_state, value, value_out, &flag, &ret);
       }
       if (ret != MPI_SUCCESS)
         xbt_free(value_out);
@@ -111,7 +110,7 @@ int Comm::dup(MPI_Comm* newcomm){
     }
     if (flag) {
       elem.refcount++;
-      (*newcomm)->attributes().emplace(it.first, value_out);
+      (*newcomm)->attributes().try_emplace(key, value_out);
     }
   }
   //duplicate info if present
@@ -186,9 +185,9 @@ std::string Comm::name() const
   std::array<char, MPI_MAX_NAME_STRING + 1> name;
   this->get_name(name.data(), &size);
   if (name[0]=='\0')
-    return std::string("MPI_Comm");
+    return "MPI_Comm";
   else
-    return std::string(name.data());
+    return name.data();
 }
 
 
@@ -304,10 +303,10 @@ MPI_Comm Comm::split(int color, int key)
         }
         std::vector<MPI_Request> requests(rankmap.size());
         int reqs              = 0;
-        for (auto const& rank : rankmap) {
-          if (rank.second != 0) {
+        for (auto const& [_, rank] : rankmap) {
+          if (rank != 0) {
             group_snd[reqs]=new  Group(group_out);
-            requests[reqs] = Request::isend(&(group_snd[reqs]), 1, MPI_PTR, rank.second, system_tag, this);
+            requests[reqs] = Request::isend(&(group_snd[reqs]), 1, MPI_PTR, rank, system_tag, this);
             reqs++;
           }
         }
@@ -365,8 +364,6 @@ void Comm::unref(Comm* comm){
       delete[] comm->errhandlers_;
     } else if (comm->errhandler_ != MPI_ERRHANDLER_NULL)
       simgrid::smpi::Errhandler::unref(comm->errhandler_);
-    if(comm->collectives_counts_!=nullptr)
-      delete[] comm->collectives_counts_;
   }
   Group::unref(comm->group_);
   if(comm->refcount_==0)
@@ -657,8 +654,8 @@ unsigned int Comm::get_collectives_count()
   if (this==MPI_COMM_UNINITIALIZED){
     return smpi_process()->comm_world()->get_collectives_count();
   }else if(this == MPI_COMM_WORLD || this == smpi_process()->comm_world()){
-    if(collectives_counts_==nullptr)
-      collectives_counts_=new unsigned int[this->size()]{0};
+    if (collectives_counts_.empty())
+      collectives_counts_.resize(this->size());
     return collectives_counts_[this->rank()];
   }else{
     return collectives_count_;
@@ -670,13 +667,12 @@ void Comm::increment_collectives_count()
    if (this==MPI_COMM_UNINITIALIZED){
     smpi_process()->comm_world()->increment_collectives_count();
   }else if (this == MPI_COMM_WORLD || this == smpi_process()->comm_world()){
-    if(collectives_counts_==nullptr)
-      collectives_counts_=new unsigned int[this->size()]{0};
+    if (collectives_counts_.empty())
+      collectives_counts_.resize(this->size());
     collectives_counts_[this->rank()]++;
   }else{
     collectives_count_++;
   }
 }
 
-} // namespace smpi
-} // namespace simgrid
+} // namespace simgrid::smpi