X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea74f5d95928a521a588737e81f1de94eef25d19..2865125a12cae86515e21999f32efe33de513646:/src/smpi/internals/smpi_host.cpp

diff --git a/src/smpi/internals/smpi_host.cpp b/src/smpi/internals/smpi_host.cpp
index 60816f9e43..8704fbeb08 100644
--- a/src/smpi/internals/smpi_host.cpp
+++ b/src/smpi/internals/smpi_host.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-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. */
@@ -29,95 +29,35 @@ void smpi_cleanup_op_cost_callback()
   cost_cbs.clear();
 }
 
-namespace simgrid {
-namespace smpi {
+namespace simgrid::smpi {
 
 xbt::Extension<s4u::Host, smpi::Host> Host::EXTENSION_ID;
 
-double Host::orecv(size_t size, s4u::Host* src, s4u::Host* dst)
+double Host::orecv(size_t size, s4u::Host* src, s4u::Host* dst) const
 {
   /* return user's callback if available */
-  auto it = cost_cbs.find(SmpiOperation::RECV);
-  if (it != cost_cbs.end())
+  if (auto it = cost_cbs.find(SmpiOperation::RECV); it != cost_cbs.end())
     return it->second(size, src, dst);
 
-  /* fallback to smpi/or config */
-  double current = orecv_parsed_values.empty() ? 0.0 : orecv_parsed_values.front().values[0] +
-                                                           orecv_parsed_values.front().values[1] * size;
-
-  // Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval
-  // sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size)
-  // Note: parse_factor() (used before) already sorts the vector we iterate over!
-  for (auto const& fact : orecv_parsed_values) {
-    if (size <= fact.factor) { // Values already too large, use the previously computed value of current!
-      XBT_DEBUG("or : %zu <= %zu return %.10f", size, fact.factor, current);
-      return current;
-    } else {
-      // If the next section is too large, the current section must be used.
-      // Hence, save the cost, as we might have to use it.
-      current=fact.values[0]+fact.values[1]*size;
-    }
-  }
-  XBT_DEBUG("smpi_or: %zu is larger than largest boundary, return %.10f", size, current);
-
-  return current;
+  return orecv_(size);
 }
 
-double Host::osend(size_t size, s4u::Host* src, s4u::Host* dst)
+double Host::osend(size_t size, s4u::Host* src, s4u::Host* dst) const
 {
   /* return user's callback if available */
-  auto it = cost_cbs.find(SmpiOperation::SEND);
-  if (it != cost_cbs.end())
+  if (auto it = cost_cbs.find(SmpiOperation::SEND); it != cost_cbs.end())
     return it->second(size, src, dst);
 
-  /* fallback to smpi/os config */
-  double current =
-      osend_parsed_values.empty() ? 0.0 : osend_parsed_values[0].values[0] + osend_parsed_values[0].values[1] * size;
-  // Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval
-  // sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size)
-  // Note: parse_factor() (used before) already sorts the vector we iterate over!
-  for (auto const& fact : osend_parsed_values) {
-    if (size <= fact.factor) { // Values already too large, use the previously computed value of current!
-      XBT_DEBUG("os : %zu <= %zu return %.10f", size, fact.factor, current);
-      return current;
-    } else {
-      // If the next section is too large, the current section must be used.
-      // Hence, save the cost, as we might have to use it.
-      current = fact.values[0] + fact.values[1] * size;
-    }
-  }
-  XBT_DEBUG("Searching for smpi/os: %zu is larger than the largest boundary, return %.10f", size, current);
-
-  return current;
+  return osend_(size);
 }
 
-double Host::oisend(size_t size, s4u::Host* src, s4u::Host* dst)
+double Host::oisend(size_t size, s4u::Host* src, s4u::Host* dst) const
 {
   /* return user's callback if available */
-  auto it = cost_cbs.find(SmpiOperation::ISEND);
-  if (it != cost_cbs.end())
+  if (auto it = cost_cbs.find(SmpiOperation::ISEND); it != cost_cbs.end())
     return it->second(size, src, dst);
 
-  /* fallback to smpi/ois config */
-  double current =
-      oisend_parsed_values.empty() ? 0.0 : oisend_parsed_values[0].values[0] + oisend_parsed_values[0].values[1] * size;
-
-  // Iterate over all the sections that were specified and find the right value. (fact.factor represents the interval
-  // sizes; we want to find the section that has fact.factor <= size and no other such fact.factor <= size)
-  // Note: parse_factor() (used before) already sorts the vector we iterate over!
-  for (auto const& fact : oisend_parsed_values) {
-    if (size <= fact.factor) { // Values already too large, use the previously  computed value of current!
-      XBT_DEBUG("ois : %zu <= %zu return %.10f", size, fact.factor, current);
-      return current;
-    } else {
-      // If the next section is too large, the current section must be used.
-      // Hence, save the cost, as we might have to use it.
-      current = fact.values[0] + fact.values[1] * size;
-    }
-  }
-  XBT_DEBUG("Searching for smpi/ois: %zu is larger than the largest boundary, return %.10f", size, current);
-
-  return current;
+  return oisend_(size);
 }
 
 void Host::check_factor_configs(const std::string& op) const
@@ -137,29 +77,22 @@ Host::Host(s4u::Host* ptr) : host(ptr)
     smpi::Host::EXTENSION_ID = s4u::Host::extension_create<Host>();
 
   check_factor_configs("smpi/or");
-  const char* orecv_string = host->get_property("smpi/or");
-  if (orecv_string != nullptr) {
-    orecv_parsed_values = simgrid::smpi::utils::parse_factor(orecv_string);
-  } else {
-    orecv_parsed_values = simgrid::smpi::utils::parse_factor(config::get_value<std::string>("smpi/or"));
-  }
+  if (const char* orecv_string = host->get_property("smpi/or"))
+    orecv_.parse(orecv_string);
+  else
+    orecv_.parse(config::get_value<std::string>("smpi/or"));
 
   check_factor_configs("smpi/os");
-  const char* osend_string = host->get_property("smpi/os");
-  if (osend_string != nullptr) {
-    osend_parsed_values = simgrid::smpi::utils::parse_factor(osend_string);
-  } else {
-    osend_parsed_values = simgrid::smpi::utils::parse_factor(config::get_value<std::string>("smpi/os"));
-  }
+  if (const char* osend_string = host->get_property("smpi/os"))
+    osend_.parse(osend_string);
+  else
+    osend_.parse(config::get_value<std::string>("smpi/os"));
 
   check_factor_configs("smpi/ois");
-  const char* oisend_string = host->get_property("smpi/ois");
-  if (oisend_string != nullptr) {
-    oisend_parsed_values = simgrid::smpi::utils::parse_factor(oisend_string);
-  } else {
-    oisend_parsed_values = simgrid::smpi::utils::parse_factor(config::get_value<std::string>("smpi/ois"));
-  }
+  if (const char* oisend_string = host->get_property("smpi/ois"))
+    oisend_.parse(oisend_string);
+  else
+    oisend_.parse(config::get_value<std::string>("smpi/ois"));
 }
 
-} // namespace smpi
-} // namespace simgrid
+} // namespace simgrid::smpi