X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/985cb4f936f5d78428b12093010b8a99a6c31187..e6e7aa1dcecc9e26fe09ede088b3ef9848b18eb3:/src/surf/network_smpi.cpp

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
index 4988883191..f96bc1a406 100644
--- a/src/surf/network_smpi.cpp
+++ b/src/surf/network_smpi.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2019. 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. */
@@ -34,7 +34,6 @@ void surf_network_model_init_SMPI()
   if (surf_network_model)
     return;
   surf_network_model = new simgrid::kernel::resource::NetworkSmpiModel();
-  all_existing_models->push_back(surf_network_model);
 
   simgrid::config::set_default<double>("network/weight-S", 8775);
 }
@@ -45,14 +44,13 @@ namespace resource {
 
 NetworkSmpiModel::NetworkSmpiModel() : NetworkCm02Model()
 {
+  /* Do not add this into all_existing_models: our ancestor already does so */
 }
 
-NetworkSmpiModel::~NetworkSmpiModel() = default;
-
-double NetworkSmpiModel::bandwidthFactor(double size)
+double NetworkSmpiModel::get_bandwidth_factor(double size)
 {
   if (smpi_bw_factor.empty())
-    smpi_bw_factor = parse_factor(simgrid::config::get_value<std::string>("smpi/bw-factor"));
+    smpi_bw_factor = parse_factor(config::get_value<std::string>("smpi/bw-factor"));
 
   double current = 1.0;
   for (auto const& fact : smpi_bw_factor) {
@@ -67,10 +65,10 @@ double NetworkSmpiModel::bandwidthFactor(double size)
   return current;
 }
 
-double NetworkSmpiModel::latencyFactor(double size)
+double NetworkSmpiModel::get_latency_factor(double size)
 {
   if (smpi_lat_factor.empty())
-    smpi_lat_factor = parse_factor(simgrid::config::get_value<std::string>("smpi/lat-factor"));
+    smpi_lat_factor = parse_factor(config::get_value<std::string>("smpi/lat-factor"));
 
   double current = 1.0;
   for (auto const& fact : smpi_lat_factor) {
@@ -85,18 +83,10 @@ double NetworkSmpiModel::latencyFactor(double size)
   return current;
 }
 
-double NetworkSmpiModel::bandwidthConstraint(double rate, double bound, double size)
+double NetworkSmpiModel::get_bandwidth_constraint(double rate, double bound, double size)
 {
-  return rate < 0 ? bound : std::min(bound, rate * bandwidthFactor(size));
-}
-
-/************
- * Resource *
- ************/
-
-/**********
- * Action *
- **********/
-}
+  return rate < 0 ? bound : std::min(bound, rate * get_bandwidth_factor(size));
 }
+} // namespace resource
+} // namespace kernel
 } // namespace simgrid