Merge branch 'master' into mc-process

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

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index ffc5da4..2db53d2 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -8,8 +8,6 @@
 #include "simgrid/sg_config.h"
 #include "surf/surf.h"
 
-#ifdef HAVE_TRACING
-
 XBT_LOG_NEW_CATEGORY(instr, "Logging the behavior of the tracing system (used for Visualization/Analysis of simulations)");
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 
@@ -133,11 +131,11 @@ int TRACE_start()
     XBT_DEBUG("Tracing is on");
 
     /* 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_vm_variables = xbt_dict_new_homogeneous (xbt_free);
-    user_link_variables = xbt_dict_new_homogeneous(xbt_free);
+    created_categories = xbt_dict_new_homogeneous(xbt_free_f);
+    declared_marks = xbt_dict_new_homogeneous(xbt_free_f);
+    user_host_variables = xbt_dict_new_homogeneous(xbt_free_f);
+    user_vm_variables = xbt_dict_new_homogeneous(xbt_free_f);
+    user_link_variables = xbt_dict_new_homogeneous(xbt_free_f);
 
     if (TRACE_start_functions != NULL) {
       void (*func) ();
@@ -820,5 +818,3 @@ void instr_resume_tracing (void)
 #undef OPT_TRACING_COMMENT_FILE
 #undef OPT_VIVA_UNCAT_CONF
 #undef OPT_VIVA_CAT_CONF
-
-#endif /* HAVE_TRACING */