[trace] check if user variables are being correctly used

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

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 2770759..b0fc9e0 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -40,8 +40,6 @@ static int trace_disable_destroy;
 static int trace_configured = 0;
 static int trace_active = 0;
 
-xbt_dict_t created_categories; //declared in instr_interface.c
-
 static void TRACE_getopts(void)
 {
   trace_enabled = xbt_cfg_get_int(_surf_cfg_set, OPT_TRACING);
@@ -81,6 +79,9 @@ int TRACE_start()
 
   /* other trace initialization */
   created_categories = xbt_dict_new_homogeneous(xbt_free);
+  declared_marks = xbt_dict_new_homogeneous (xbt_free);
+  user_host_variables = xbt_dict_new_homogeneous (xbt_free);
+  user_link_variables = xbt_dict_new_homogeneous (xbt_free);
   TRACE_surf_alloc();
   TRACE_smpi_alloc();
   return 0;
@@ -264,7 +265,7 @@ void TRACE_global_init(int *argc, char **argv)
                    NULL, NULL);
 
   /* tracing buffer */
-  int default_buffer = 0;
+  int default_buffer = 1;
   xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_BUFFER,
                    "Buffer trace events to put them in temporal order.",
                    xbt_cfgelm_int, &default_buffer, 0, 1,
@@ -506,16 +507,6 @@ void TRACE_generate_triva_cat_conf (void)
   }
 }
 
-void TRACE_set_network_update_mechanism (void)
-{
-  if (TRACE_is_enabled()){
-    if (TRACE_categorized() || TRACE_uncategorized()){
-      XBT_INFO ("Tracing resource utilization active, network/optim configuration now set to Full.");
-      xbt_cfg_set_string (_surf_cfg_set, "network/optim", "Full");
-    }
-  }
-}
-
 #undef OPT_TRACING
 #undef OPT_TRACING_PLATFORM
 #undef OPT_TRACING_SMPI