Change xbt_cfg_set_default_<type> -> simgrid::config::set_default<type>.

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 3784c9b..cf67f8c 100644 (file)
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -161,7 +161,7 @@ void SD_init_nocheck(int *argc, char **argv)
 
   surf_init(argc, argv);
 
 
   surf_init(argc, argv);
 

-  xbt_cfg_setdefault_string("host/model", "ptask_L07");
+  simgrid::config::set_default<std::string>("host/model", "ptask_L07");

   if (simgrid::config::get_value<bool>("clean-atexit"))
     atexit(SD_exit);
   if (_sg_cfg_exit_asap) {
   if (simgrid::config::get_value<bool>("clean-atexit"))
     atexit(SD_exit);
   if (_sg_cfg_exit_asap) {

diff --git a/src/simgrid/sg_config.cpp b/src/simgrid/sg_config.cpp
index dc9ef42..aa31ac1 100644 (file)
--- a/src/simgrid/sg_config.cpp
+++ b/src/simgrid/sg_config.cpp
@@ -458,7 +458,7 @@ void sg_config_init(int *argc, char **argv)
                              "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end.");
 
   if (surf_path.empty())
                              "Whether to cleanup SimGrid at exit. Disable it if your code segfaults after its end.");
 
   if (surf_path.empty())

-    xbt_cfg_setdefault_string("path", "./");
+    simgrid::config::set_default<std::string>("path", "./");

 
   _sg_cfg_init_status = 1;
 
 
   _sg_cfg_init_status = 1;
 

diff --git a/src/surf/host_clm03.cpp b/src/surf/host_clm03.cpp
index ba27fcb..912e630 100644 (file)
--- a/src/surf/host_clm03.cpp
+++ b/src/surf/host_clm03.cpp
@@ -20,7 +20,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_host);
 void surf_host_model_init_current_default()
 {
   surf_host_model = new simgrid::surf::HostCLM03Model();
 void surf_host_model_init_current_default()
 {
   surf_host_model = new simgrid::surf::HostCLM03Model();

-  xbt_cfg_setdefault_boolean("network/crosstraffic", "yes");
+  simgrid::config::set_default<bool>("network/crosstraffic", true);

   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
 
   surf_cpu_model_init_Cas01();
   surf_network_model_init_LegrandVelho();
 

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 02ea9ec..b40a6b9 100644 (file)
--- 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);
 
   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;
 
   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);
 
   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);
 
   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);
 
   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);
 
   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);
 
   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);
 
   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);
 
   surf_network_model = new simgrid::kernel::resource::NetworkCm02Model(&simgrid::kernel::lmm::make_new_lagrange_system);
   all_existing_models->push_back(surf_network_model);

diff --git a/src/surf/network_ib.cpp b/src/surf/network_ib.cpp
index f9599b6..3445c11 100644 (file)
--- a/src/surf/network_ib.cpp
+++ b/src/surf/network_ib.cpp
@@ -93,8 +93,7 @@ void surf_network_model_init_IB()
   simgrid::s4u::Link::onCommunicationStateChange.connect(IB_action_state_changed_callback);
   simgrid::s4u::Link::onCommunicate.connect(IB_action_init_callback);
   simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);
   simgrid::s4u::Link::onCommunicationStateChange.connect(IB_action_state_changed_callback);
   simgrid::s4u::Link::onCommunicate.connect(IB_action_init_callback);
   simgrid::s4u::Host::onCreation.connect(IB_create_host_callback);

-  xbt_cfg_setdefault_double("network/weight-S", 8775);
-
+  simgrid::config::set_default<double>("network/weight-S", 8775);

 }
 
 namespace simgrid {
 }
 
 namespace simgrid {

diff --git a/src/surf/network_smpi.cpp b/src/surf/network_smpi.cpp
index 0f089bc..4988883 100644 (file)
--- a/src/surf/network_smpi.cpp
+++ b/src/surf/network_smpi.cpp
@@ -36,7 +36,7 @@ void surf_network_model_init_SMPI()
   surf_network_model = new simgrid::kernel::resource::NetworkSmpiModel();
   all_existing_models->push_back(surf_network_model);
 
   surf_network_model = new simgrid::kernel::resource::NetworkSmpiModel();
   all_existing_models->push_back(surf_network_model);
 

-  xbt_cfg_setdefault_double("network/weight-S", 8775);
+  simgrid::config::set_default<double>("network/weight-S", 8775);

 }
 
 namespace simgrid {
 }
 
 namespace simgrid {