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

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 035ca869fe..b40a6b985c 100644
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -38,9 +38,9 @@ void surf_network_model_init_LegrandVelho()
   surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
   all_existing_models->push_back(surf_network_model);
 
-  xbt_cfg_setdefault_double("network/latency-factor",      13.01);
-  xbt_cfg_setdefault_double("network/bandwidth-factor",     0.97);
-  xbt_cfg_setdefault_double("network/weight-S",         20537);
+  simgrid::config::set_default<double>("network/latency-factor", 13.01);
+  simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
+  simgrid::config::set_default<double>("network/weight-S", 20537);
 }
 
 /***************************************************************************/
@@ -60,9 +60,9 @@ void surf_network_model_init_CM02()
   if (surf_network_model)
     return;
 
-  xbt_cfg_setdefault_double("network/latency-factor",   1.0);
-  xbt_cfg_setdefault_double("network/bandwidth-factor", 1.0);
-  xbt_cfg_setdefault_double("network/weight-S",         0.0);
+  simgrid::config::set_default<double>("network/latency-factor", 1.0);
+  simgrid::config::set_default<double>("network/bandwidth-factor", 1.0);
+  simgrid::config::set_default<double>("network/weight-S", 0.0);
 
   surf_network_model = new simgrid::kernel::resource::NetworkCm02Model();
   all_existing_models->push_back(surf_network_model);
@@ -86,9 +86,9 @@ void surf_network_model_init_Reno()
   using namespace simgrid::kernel;
   lmm::Lagrange::set_default_protocol_function(lmm::func_reno_f, lmm::func_reno_fp, lmm::func_reno_fpi);
 
-  xbt_cfg_setdefault_double("network/latency-factor", 13.01);
-  xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
-  xbt_cfg_setdefault_double("network/weight-S", 20537);
+  simgrid::config::set_default<double>("network/latency-factor", 13.01);
+  simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
+  simgrid::config::set_default<double>("network/weight-S", 20537);
 
   surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
   all_existing_models->push_back(surf_network_model);
@@ -103,9 +103,9 @@ void surf_network_model_init_Reno2()
   using namespace simgrid::kernel;
   lmm::Lagrange::set_default_protocol_function(lmm::func_reno2_f, lmm::func_reno2_fp, lmm::func_reno2_fpi);
 
-  xbt_cfg_setdefault_double("network/latency-factor", 13.01);
-  xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
-  xbt_cfg_setdefault_double("network/weight-S", 20537);
+  simgrid::config::set_default<double>("network/latency-factor", 13.01);
+  simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
+  simgrid::config::set_default<double>("network/weight-S", 20537);
 
   surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
   all_existing_models->push_back(surf_network_model);
@@ -119,9 +119,9 @@ void surf_network_model_init_Vegas()
   using namespace simgrid::kernel;
   lmm::Lagrange::set_default_protocol_function(lmm::func_vegas_f, lmm::func_vegas_fp, lmm::func_vegas_fpi);
 
-  xbt_cfg_setdefault_double("network/latency-factor", 13.01);
-  xbt_cfg_setdefault_double("network/bandwidth-factor", 0.97);
-  xbt_cfg_setdefault_double("network/weight-S", 20537);
+  simgrid::config::set_default<double>("network/latency-factor", 13.01);
+  simgrid::config::set_default<double>("network/bandwidth-factor", 0.97);
+  simgrid::config::set_default<double>("network/weight-S", 20537);
 
   surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
   all_existing_models->push_back(surf_network_model);
@@ -132,10 +132,11 @@ namespace kernel {
 namespace resource {
 
 NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(bool))
-    : NetworkModel(xbt_cfg_get_string("network/optim") == "Full" ? Model::UpdateAlgo::Full : Model::UpdateAlgo::Lazy)
+    : NetworkModel(simgrid::config::get_value<std::string>("network/optim") == "Full" ? Model::UpdateAlgo::Full
+                                                                                      : Model::UpdateAlgo::Lazy)
 {
-  std::string optim = xbt_cfg_get_string("network/optim");
-  bool select = xbt_cfg_get_boolean("network/maxmin-selective-update");
+  std::string optim = simgrid::config::get_value<std::string>("network/optim");
+  bool select       = simgrid::config::get_value<bool>("network/maxmin-selective-update");
 
   if (optim == "Lazy") {
     xbt_assert(select || xbt_cfg_is_default_value("network/maxmin-selective-update"),
@@ -144,11 +145,11 @@ NetworkCm02Model::NetworkCm02Model(kernel::lmm::System* (*make_new_lmm_system)(b
   }
 
   set_maxmin_system(make_new_lmm_system(select));
-  loopback_     = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, SURF_LINK_FATPIPE);
+  loopback_ = NetworkCm02Model::createLink("__loopback__", 498000000, 0.000015, s4u::Link::SharingPolicy::FATPIPE);
 }
 
 LinkImpl* NetworkCm02Model::createLink(const std::string& name, double bandwidth, double latency,
-                                       e_surf_link_sharing_policy_t policy)
+                                       s4u::Link::SharingPolicy policy)
 {
   return new NetworkCm02Link(this, name, bandwidth, latency, policy, get_maxmin_system());
 }
@@ -335,7 +336,7 @@ Action* NetworkCm02Model::communicate(s4u::Host* src, s4u::Host* dst, double siz
  * Resource *
  ************/
 NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& name, double bandwidth, double latency,
-                                 e_surf_link_sharing_policy_t policy, kernel::lmm::System* system)
+                                 s4u::Link::SharingPolicy policy, kernel::lmm::System* system)
     : LinkImpl(model, name, system->constraint_new(this, sg_bandwidth_factor * bandwidth))
 {
   bandwidth_.scale = 1.0;
@@ -344,7 +345,7 @@ NetworkCm02Link::NetworkCm02Link(NetworkCm02Model* model, const std::string& nam
   latency_.scale = 1.0;
   latency_.peak  = latency;
 
-  if (policy == SURF_LINK_FATPIPE)
+  if (policy == s4u::Link::SharingPolicy::FATPIPE)
     get_constraint()->unshare();
 
   simgrid::s4u::Link::onCreation(this->piface_);