X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/237fd22b56db7d1c67360c37559ce3aab16a002d..HEAD:/src/smpi/mpi/smpi_datatype.cpp

diff --git a/src/smpi/mpi/smpi_datatype.cpp b/src/smpi/mpi/smpi_datatype.cpp
index 879b9f8ec9..539e567e25 100644
--- a/src/smpi/mpi/smpi_datatype.cpp
+++ b/src/smpi/mpi/smpi_datatype.cpp
@@ -1,5 +1,5 @@
 /* smpi_datatype.cpp -- MPI primitives to handle datatypes                  */
-/* Copyright (c) 2009-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2009-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. */
@@ -104,9 +104,7 @@ CREATE_MPI_DATATYPE(PTR, 58, void*, DT_FLAG_PREDEFINED)
 CREATE_MPI_DATATYPE(COUNT, 59, long long, DT_FLAG_MULTILANG)
 MPI_Datatype MPI_PTR = &smpi_MPI_PTR;
 
-
-namespace simgrid{
-namespace smpi{
+namespace simgrid::smpi {
 
 std::unordered_map<int, smpi_key_elem> Datatype::keyvals_; // required by the Keyval class implementation
 int Datatype::keyval_id_=0; // required by the Keyval class implementation
@@ -118,21 +116,13 @@ Datatype::Datatype(int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags) : D
 Datatype::Datatype(int size, MPI_Aint lb, MPI_Aint ub, int flags) : size_(size), lb_(lb), ub_(ub), flags_(flags)
 {
   this->add_f();
-#if SIMGRID_HAVE_MC
-  if(MC_is_active())
-    MC_ignore(&refcount_, sizeof refcount_);
-#endif
 }
 
 // for predefined types, so refcount_ = 0.
 Datatype::Datatype(const char* name, int ident, int size, MPI_Aint lb, MPI_Aint ub, int flags)
     : name_(name), id(std::to_string(ident)), size_(size), lb_(lb), ub_(ub), flags_(flags), refcount_(0)
 {
-  id2type_lookup.insert({id, this});
-#if SIMGRID_HAVE_MC
-  if(MC_is_active())
-    MC_ignore(&refcount_, sizeof refcount_);
-#endif
+  id2type_lookup.try_emplace(id, this);
 }
 
 Datatype::Datatype(Datatype* datatype, int* ret)
@@ -166,19 +156,19 @@ int Datatype::copy_attrs(Datatype* datatype){
   flags_ &= ~DT_FLAG_PREDEFINED;
 
   set_contents(MPI_COMBINER_DUP, 0, nullptr, 0, nullptr, 1, &datatype);
-  for (auto const& it : datatype->attributes()) {
-    auto elem_it = keyvals_.find(it.first);
-    xbt_assert(elem_it != keyvals_.end(), "Keyval not found for Datatype: %d", it.first);
+  for (auto const& [key, value] : datatype->attributes()) {
+    auto elem_it = keyvals_.find(key);
+    xbt_assert(elem_it != keyvals_.end(), "Keyval not found for Datatype: %d", key);
 
     smpi_key_elem& elem = elem_it->second;
     int ret             = MPI_SUCCESS;
     int flag            = 0;
     void* value_out     = nullptr;
     if (elem.copy_fn.type_copy_fn == MPI_TYPE_DUP_FN) {
-      value_out = it.second;
+      value_out = value;
       flag      = 1;
     } else if (elem.copy_fn.type_copy_fn != MPI_NULL_COPY_FN) {
-      ret = elem.copy_fn.type_copy_fn(datatype, it.first, elem.extra_state, it.second, &value_out, &flag);
+      ret = elem.copy_fn.type_copy_fn(datatype, key, elem.extra_state, value, &value_out, &flag);
     }
     if (ret != MPI_SUCCESS)
       return ret;
@@ -186,10 +176,10 @@ int Datatype::copy_attrs(Datatype* datatype){
     if (elem.copy_fn.type_copy_fn_fort != MPI_NULL_COPY_FN) {
       value_out = xbt_new(int, 1);
       if (*(int*)*elem.copy_fn.type_copy_fn_fort == 1) { // MPI_TYPE_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.type_copy_fn_fort(datatype, it.first, elem.extra_state, it.second, value_out, &flag, &ret);
+        elem.copy_fn.type_copy_fn_fort(datatype, key, elem.extra_state, value, value_out, &flag, &ret);
       }
       if (ret != MPI_SUCCESS) {
         xbt_free(value_out);
@@ -198,7 +188,7 @@ int Datatype::copy_attrs(Datatype* datatype){
     }
     if (flag) {
       elem.refcount++;
-      attributes().emplace(it.first, value_out);
+      attributes().try_emplace(key, value_out);
     }
   }
   return MPI_SUCCESS;
@@ -213,11 +203,6 @@ int Datatype::clone(MPI_Datatype* type){
 void Datatype::ref()
 {
   refcount_++;
-
-#if SIMGRID_HAVE_MC
-  if(MC_is_active())
-    MC_ignore(&refcount_, sizeof refcount_);
-#endif
 }
 
 void Datatype::unref(MPI_Datatype datatype)
@@ -225,11 +210,6 @@ void Datatype::unref(MPI_Datatype datatype)
   if (datatype->refcount_ > 0)
     datatype->refcount_--;
 
-#if SIMGRID_HAVE_MC
-  if(MC_is_active())
-    MC_ignore(&datatype->refcount_, sizeof datatype->refcount_);
-#endif
-
   if (datatype->refcount_ == 0 && not(datatype->flags_ & DT_FLAG_PREDEFINED))
     delete datatype;
 }
@@ -654,5 +634,4 @@ Datatype* Datatype::f2c(int id)
   return static_cast<Datatype*>(F2C::f2c(id));
 }
 
-} // namespace smpi
-} // namespace simgrid
+} // namespace simgrid::smpi