Merge branch 'v3_9_x' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid into v3_9_x

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

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index c71ad91..3737cf7 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -77,9 +77,6 @@ void TRACE_add_start_function(void (*func) ())
   if (TRACE_start_functions == NULL)
     TRACE_start_functions = xbt_dynar_new(sizeof(void (*)()), NULL);
   xbt_dynar_push(TRACE_start_functions, &func);
-
-  
-  
 }
 
 int TRACE_start()
@@ -95,8 +92,44 @@ int TRACE_start()
     /* open the trace file */
     TRACE_paje_start();
 
-    int retval;
-    if (!trace_active) {
+    /* activate trace */
+    if (trace_active == 1) {
+      THROWF(tracing_error, 0, "Tracing is already active");
+    }
+    trace_active = 1;
+    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);
+
+    if (TRACE_start_functions != NULL) {
+      void (*func) ();
+      unsigned int iter = xbt_dynar_length(TRACE_start_functions);
+      xbt_dynar_foreach(TRACE_start_functions, iter, func) {
+        func();
+      }
+    }
+  }
+  xbt_dynar_free(&TRACE_start_functions);
+  return 0;
+}
+
+xbt_dynar_t TRACE_end_functions = NULL;
+void TRACE_add_end_function(void (*func) (void))
+{
+  if (TRACE_end_functions == NULL)
+    TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), NULL);
+  xbt_dynar_push(TRACE_end_functions, &func);
+}
+
+int TRACE_end()
+{
+  int retval;
+  if (!trace_active) {
     retval = 1;
   } else {
     retval = 0;
@@ -124,6 +157,7 @@ int TRACE_start()
 
     xbt_dict_free(&user_link_variables);
     xbt_dict_free(&user_host_variables);
+    xbt_dict_free(&user_vm_variables);
     xbt_dict_free(&declared_marks);
     xbt_dict_free(&created_categories);
 
@@ -139,50 +173,6 @@ int TRACE_start()
   return retval;
 }
 
-xbt_dynar_t TRACE_end_functions = NULL;
-void TRACE_add_end_function(void (*func) (void))
-{
-  if (TRACE_end_functions == NULL)
-    TRACE_end_functions = xbt_dynar_new(sizeof(void (*)(void)), NULL);
-  xbt_dynar_push(TRACE_end_functions, &func);
-}
-
-int TRACE_end()
-{
-  if (!trace_active)
-    return 1;
-
-  TRACE_generate_viva_uncat_conf();
-  TRACE_generate_viva_cat_conf();
-
-  /* dump trace buffer */
-  TRACE_last_timestamp_to_dump = surf_get_clock();
-  TRACE_paje_dump_buffer(1);
-
-  /* destroy all data structures of tracing (and free) */
-  PJ_container_free_all();
-  PJ_type_free_all();
-  PJ_container_release();
-  PJ_type_release();
-  TRACE_smpi_release();
-  TRACE_surf_release();
-  xbt_dict_free(&user_link_variables);
-  xbt_dict_free(&user_host_variables);
-  xbt_dict_free(&user_vm_variables);
-
-  xbt_dict_free(&declared_marks);
-  xbt_dict_free(&created_categories);
-
-  /* close the trace file */
-  TRACE_paje_end();
-
-  /* de-activate trace */
-  trace_active = 0;
-  XBT_DEBUG ("Tracing is off");
-  XBT_DEBUG("Tracing system is shutdown");
-  return 0;
-}
-
 int TRACE_needs_platform (void)
 {
   return TRACE_msg_process_is_enabled() ||
@@ -370,7 +360,7 @@ void TRACE_global_init(int *argc, char **argv)
 
   /* msg process */
   int default_tracing_msg_vm = 0;
-  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_VM,
+  xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_MSG_VM,
                    "Tracing of MSG process behavior.",
                    xbt_cfgelm_int, &default_tracing_msg_vm, 0, 1,
                    NULL, NULL);