X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26ba6b5c4116ebca3e28315e488973013097466d..167d54120fca91495ebe52ca6dec8a830a7ab023:/src/smpi/internals/smpi_utils.cpp

diff --git a/src/smpi/internals/smpi_utils.cpp b/src/smpi/internals/smpi_utils.cpp
index 77436cc238..6660c506fb 100644
--- a/src/smpi/internals/smpi_utils.cpp
+++ b/src/smpi/internals/smpi_utils.cpp
@@ -22,9 +22,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_utils, smpi, "Logging specific to SMPI (uti
 extern std::string surf_parsed_filename;
 extern int surf_parse_lineno;
 
-namespace simgrid {
-namespace smpi {
-namespace utils {
+namespace simgrid::smpi::utils {
 
 double total_benched_time=0;
 unsigned long total_malloc_size=0;
@@ -51,6 +49,48 @@ std::unordered_map<const void*, alloc_metadata_t> allocs;
 
 std::unordered_map<int, std::vector<std::string>> collective_calls;
 
+void FactorSet::parse(const std::string& values)
+{
+  factors_     = parse_factor(values);
+  initialized_ = true;
+}
+
+FactorSet::FactorSet(const std::string& name, double default_value,
+                     std::function<double(s_smpi_factor_t const&, double)> const& lambda)
+    : name_(name), default_value_(default_value), lambda_(lambda)
+{
+}
+
+double FactorSet::operator()()
+{
+  return lambda_(factors_.front(), 0);
+}
+
+double FactorSet::operator()(double size)
+{
+  if (factors_.empty())
+    return default_value_;
+
+  for (long unsigned i = 0; i < factors_.size(); i++) {
+    auto const& fact = factors_[i];
+
+    if (size <= fact.factor) { // Too large already, use the previous value
+
+      if (i == 0) { // Before the first boundary: use the default value
+        XBT_DEBUG("%s: %f <= %zu return default %f", name_.c_str(), size, fact.factor, default_value_);
+        return default_value_;
+      }
+      double val = lambda_(factors_[i - 1], size);
+      XBT_DEBUG("%s: %f <= %zu return %f", name_.c_str(), size, fact.factor, val);
+      return val;
+    }
+  }
+  double val = lambda_(factors_.back(), size);
+
+  XBT_DEBUG("%s: %f > %zu return %f", name_.c_str(), size, factors_.back().factor, val);
+  return val;
+}
+
 std::vector<s_smpi_factor_t> parse_factor(const std::string& smpi_coef_string)
 {
   std::vector<s_smpi_factor_t> smpi_factor;
@@ -113,7 +153,7 @@ void add_benched_time(double time){
   total_benched_time += time;
 }
 
-void account_malloc_size(size_t size, const std::string& file, int line, void* ptr)
+void account_malloc_size(size_t size, std::string_view file, int line, const void* ptr)
 {
   if (smpi_cfg_display_alloc()) {
     alloc_metadata_t metadata;
@@ -121,7 +161,7 @@ void account_malloc_size(size_t size, const std::string& file, int line, void* p
     metadata.line = line;
     metadata.numcall = 1;
     metadata.file    = file;
-    allocs.emplace(ptr, metadata);
+    allocs.try_emplace(ptr, metadata);
 
     total_malloc_size += size;
     if(size > max_malloc.size){
@@ -178,25 +218,24 @@ static void print_leaked_handles()
   // freed at this point
   bool display_advice = false;
   std::map<std::string, int, std::less<>> count;
-  for (const auto& elem : handles) {
-    std::string key = elem.second->name();
-    if ((not xbt_log_no_loc) && (not elem.second->call_location().empty()))
-      key += " at " + elem.second->call_location();
+  for (const auto& [_, elem] : handles) {
+    std::string key = elem->name();
+    if ((not xbt_log_no_loc) && (not elem->call_location().empty()))
+      key += " at " + elem->call_location();
     else
       display_advice = true;
-    auto result      = count.emplace(key, 1);
-    if (result.second == false)
-      result.first->second++;
+    auto& result = count.try_emplace(key, 0).first->second;
+    result++;
   }
   if (display_advice)
     XBT_WARN("To get more information (location of allocations), compile your code with -trace-call-location flag of "
              "smpicc/f90");
   unsigned int i = 0;
-  for (const auto& p : count) {
-    if (p.second == 1)
-      XBT_INFO("leaked handle of type %s", p.first.c_str());
+  for (const auto& [key, value] : count) {
+    if (value == 1)
+      XBT_INFO("leaked handle of type %s", key.c_str());
     else
-      XBT_INFO("%d leaked handles of type %s", p.second, p.first.c_str());
+      XBT_INFO("%d leaked handles of type %s", value, key.c_str());
     i++;
     if (i == max)
       break;
@@ -228,19 +267,17 @@ static void print_leaked_buffers()
     size_t max_size;
   };
   std::map<std::string, struct buff_leak, std::less<>> leaks_aggreg;
-  for (const auto& elem : allocs) {
+  for (const auto& [_, elem] : allocs) {
     std::string key = "leaked allocations";
     if (not xbt_log_no_loc)
-      key = elem.second.file + ":" + std::to_string(elem.second.line) + ": " + key;
-    auto result = leaks_aggreg.emplace(key, buff_leak{1, elem.second.size, elem.second.size, elem.second.size});
-    if (result.second == false) {
-      result.first->second.count++;
-      result.first->second.total_size += elem.second.size;
-      if (elem.second.size > result.first->second.max_size)
-        result.first->second.max_size = elem.second.size;
-      else if (elem.second.size < result.first->second.min_size)
-        result.first->second.min_size = elem.second.size;
-    }
+      key = elem.file + ":" + std::to_string(elem.line) + ": " + key;
+    auto& result = leaks_aggreg.try_emplace(key, buff_leak{0, 0, elem.size, elem.size}).first->second;
+    result.count++;
+    result.total_size += elem.size;
+    if (elem.size > result.max_size)
+      result.max_size = elem.size;
+    else if (elem.size < result.min_size)
+      result.min_size = elem.size;
   }
   // now we can order by total size.
   std::vector<std::pair<std::string, buff_leak>> leaks(leaks_aggreg.begin(), leaks_aggreg.end());
@@ -248,13 +285,13 @@ static void print_leaked_buffers()
             [](auto const& a, auto const& b) { return a.second.total_size > b.second.total_size; });
 
   unsigned int i = 0;
-  for (const auto& p : leaks) {
-    if (p.second.min_size == p.second.max_size)
-      XBT_INFO("%s of total size %zu, called %d times, each with size %zu", p.first.c_str(), p.second.total_size,
-               p.second.count, p.second.min_size);
+  for (const auto& [key, value] : leaks) {
+    if (value.min_size == value.max_size)
+      XBT_INFO("%s of total size %zu, called %d times, each with size %zu", key.c_str(), value.total_size, value.count,
+               value.min_size);
     else
-      XBT_INFO("%s of total size %zu, called %d times, with minimum size %zu and maximum size %zu", p.first.c_str(),
-               p.second.total_size, p.second.count, p.second.min_size, p.second.max_size);
+      XBT_INFO("%s of total size %zu, called %d times, with minimum size %zu and maximum size %zu", key.c_str(),
+               value.total_size, value.count, value.min_size, value.max_size);
     i++;
     if (i == max)
       break;
@@ -352,9 +389,8 @@ int check_collectives_ordering(MPI_Comm comm, const std::string& call)
 {
   unsigned int count = comm->get_collectives_count();
   comm->increment_collectives_count();
-  auto vec = collective_calls.find(comm->id());
-  if (vec == collective_calls.end()) {
-    collective_calls.emplace(comm->id(), std::vector<std::string>{call});
+  if (auto vec = collective_calls.find(comm->id()); vec == collective_calls.end()) {
+    collective_calls.try_emplace(comm->id(), std::vector<std::string>{call});
   } else {
     // are we the first ? add the call
     if (vec->second.size() == count) {
@@ -371,6 +407,4 @@ int check_collectives_ordering(MPI_Comm comm, const std::string& call)
   }
   return MPI_SUCCESS;
 }
-}
-}
-} // namespace simgrid
+} // namespace simgrid::smpi::utils