simplication and uniformization

[simgrid.git] / src / instr / instr_config.cpp

diff --git a/src/instr/instr_config.cpp b/src/instr/instr_config.cpp
index e896000..1f76e6a 100644 (file)
--- a/src/instr/instr_config.cpp
+++ b/src/instr/instr_config.cpp
@@ -81,12 +81,13 @@ int TRACE_start()
   //    - enabled (with --cfg=tracing:yes)
   //    - already configured (TRACE_global_init already called)
   if (TRACE_is_enabled()) {
   //    - enabled (with --cfg=tracing:yes)
   //    - already configured (TRACE_global_init already called)
   if (TRACE_is_enabled()) {

+    instr_routing_define_callbacks();

 
     XBT_DEBUG("Tracing starts");
     /* init the tracing module to generate the right output */
 
     /* open the trace file(s) */
 
     XBT_DEBUG("Tracing starts");
     /* init the tracing module to generate the right output */
 
     /* open the trace file(s) */

-    std::string format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
+    std::string format = simgrid::config::get_value<std::string>(OPT_TRACING_FORMAT);

     XBT_DEBUG("Tracing format %s\n", format.c_str());
     if (format == "Paje") {
       TRACE_paje_start();
     XBT_DEBUG("Tracing format %s\n", format.c_str());
     if (format == "Paje") {
       TRACE_paje_start();


@@ -125,7 +126,7 @@ int TRACE_end()
     delete root_type;
 
     /* close the trace files */
     delete root_type;
 
     /* close the trace files */

-    std::string format = xbt_cfg_get_string(OPT_TRACING_FORMAT);
+    std::string format = simgrid::config::get_value<std::string>(OPT_TRACING_FORMAT);

     XBT_DEBUG("Tracing format %s\n", format.c_str());
     if (format == "Paje") {
       TRACE_paje_end();
     XBT_DEBUG("Tracing format %s\n", format.c_str());
     if (format == "Paje") {
       TRACE_paje_end();


@@ -201,62 +202,62 @@ bool TRACE_uncategorized ()
 
 bool TRACE_actor_is_enabled()
 {
 
 bool TRACE_actor_is_enabled()
 {

-  return trace_actor_enabled && TRACE_is_enabled();
+  return trace_actor_enabled && trace_enabled;

 }
 
 bool TRACE_vm_is_enabled()
 {
 }
 
 bool TRACE_vm_is_enabled()
 {

-  return trace_vm_enabled && TRACE_is_enabled();
+  return trace_vm_enabled && trace_enabled;

 }
 
 bool TRACE_disable_link()
 {
 }
 
 bool TRACE_disable_link()
 {

-  return trace_disable_link && TRACE_is_enabled();
+  return trace_disable_link && trace_enabled;

 }
 
 bool TRACE_disable_speed()
 {
 }
 
 bool TRACE_disable_speed()
 {

-  return trace_disable_power && TRACE_is_enabled();
+  return trace_disable_power && trace_enabled;

 }
 
 bool TRACE_buffer ()
 {
 }
 
 bool TRACE_buffer ()
 {

-  return trace_buffer && TRACE_is_enabled();
+  return trace_buffer && trace_enabled;

 }
 
 bool TRACE_disable_destroy ()
 {
 }
 
 bool TRACE_disable_destroy ()
 {

-  return trace_disable_destroy && TRACE_is_enabled();
+  return trace_disable_destroy && trace_enabled;

 }
 
 bool TRACE_basic ()
 {
 }
 
 bool TRACE_basic ()
 {

-  return trace_basic && TRACE_is_enabled();
+  return trace_basic && trace_enabled;

 }
 
 bool TRACE_display_sizes ()
 {
 }
 
 bool TRACE_display_sizes ()
 {

-   return trace_display_sizes && trace_smpi_enabled && TRACE_is_enabled();
+  return trace_display_sizes && trace_smpi_enabled && trace_enabled;

 }
 
 std::string TRACE_get_comment()
 {
 }
 
 std::string TRACE_get_comment()
 {

-  return xbt_cfg_get_string(OPT_TRACING_COMMENT);
+  return simgrid::config::get_value<std::string>(OPT_TRACING_COMMENT);

 }
 
 std::string TRACE_get_comment_file()
 {
 }
 
 std::string TRACE_get_comment_file()
 {

-  return xbt_cfg_get_string(OPT_TRACING_COMMENT_FILE);
+  return simgrid::config::get_value<std::string>(OPT_TRACING_COMMENT_FILE);

 }
 
 int TRACE_precision ()
 {
 }
 
 int TRACE_precision ()
 {

-  return xbt_cfg_get_int(OPT_TRACING_PRECISION);
+  return simgrid::config::get_value<int>(OPT_TRACING_PRECISION);

 }
 
 std::string TRACE_get_filename()
 {
 }
 
 std::string TRACE_get_filename()
 {

-  return xbt_cfg_get_string(OPT_TRACING_FILENAME);
+  return simgrid::config::get_value<std::string>(OPT_TRACING_FILENAME);

 }
 
 void TRACE_global_init()
 }
 
 void TRACE_global_init()