X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/05a1845ae0f4e4ed1988408ec0e8f95671ff2501..c02558d70f9c62f9f5d04f1830be4cf16ca84bc0:/src/surf/network_smpi.cpp?ds=sidebyside

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
index d0bd35f6c9..8fcb6d452c 100644
--- a/src/surf/network_smpi.cpp
+++ b/src/surf/network_smpi.cpp
@@ -88,12 +88,11 @@ void surf_network_model_init_SMPI(void)
 
   if (surf_network_model)
     return;
-  simgrid::surf::on_link.connect(netlink_parse_init);
   surf_network_model = new simgrid::surf::NetworkSmpiModel();
   xbt_dynar_push(all_existing_models, &surf_network_model);
 
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/sender_gap", 10e-6);
-  xbt_cfg_setdefault_double(_sg_cfg_set, "network/weight_S", 8775);
+  xbt_cfg_setdefault_double("network/sender-gap", 10e-6);
+  xbt_cfg_setdefault_double("network/weight-S", 8775);
 }
 
 namespace simgrid {
@@ -173,8 +172,7 @@ namespace simgrid {
     double NetworkSmpiModel::bandwidthFactor(double size)
     {
       if (!smpi_bw_factor)
-        smpi_bw_factor =
-            parse_factor(sg_cfg_get_string("smpi/bw_factor"));
+        smpi_bw_factor = parse_factor(xbt_cfg_get_string("smpi/bw-factor"));
 
       unsigned int iter = 0;
       s_smpi_factor_t fact;
@@ -194,8 +192,7 @@ namespace simgrid {
     double NetworkSmpiModel::latencyFactor(double size)
     {
       if (!smpi_lat_factor)
-        smpi_lat_factor =
-            parse_factor(sg_cfg_get_string("smpi/lat_factor"));
+        smpi_lat_factor = parse_factor(xbt_cfg_get_string("smpi/lat-factor"));
 
       unsigned int iter = 0;
       s_smpi_factor_t fact;