Trying to fix modification with new master branch

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

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 3797373..c71ad91 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -22,6 +22,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_config, instr, "Configuration");
 #define OPT_TRACING_CATEGORIZED   "tracing/categorized"
 #define OPT_TRACING_UNCATEGORIZED "tracing/uncategorized"
 #define OPT_TRACING_MSG_PROCESS   "tracing/msg/process"
+#define OPT_TRACING_MSG_VM        "tracing/msg/vm"
 #define OPT_TRACING_FILENAME      "tracing/filename"
 #define OPT_TRACING_BUFFER        "tracing/buffer"
 #define OPT_TRACING_ONELINK_ONLY  "tracing/onelink_only"
@@ -41,6 +42,7 @@ static int trace_smpi_computing;
 static int trace_categorized;
 static int trace_uncategorized;
 static int trace_msg_process_enabled;
+static int trace_msg_vm_enabled;
 static int trace_buffer;
 static int trace_onelink_only;
 static int trace_disable_destroy;
@@ -62,6 +64,7 @@ static void TRACE_getopts(void)
   trace_categorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_CATEGORIZED);
   trace_uncategorized = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_UNCATEGORIZED);
   trace_msg_process_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_MSG_PROCESS);
+  trace_msg_vm_enabled = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_MSG_VM);
   trace_buffer = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_BUFFER);
   trace_onelink_only = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_ONELINK_ONLY);
   trace_disable_destroy = xbt_cfg_get_int(_sg_cfg_set, OPT_TRACING_DISABLE_DESTROY);
@@ -74,6 +77,9 @@ 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()
@@ -89,43 +95,8 @@ int TRACE_start()
     /* open the trace file */
     TRACE_paje_start();
 
-    /* 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_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) {
+    int retval;
+    if (!trace_active) {
     retval = 1;
   } else {
     retval = 0;
@@ -168,9 +139,54 @@ int TRACE_end()
   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() ||
+         TRACE_msg_vm_is_enabled() ||
          TRACE_categorized() ||
          TRACE_uncategorized() ||
          TRACE_platform () ||
@@ -229,6 +245,12 @@ int TRACE_msg_process_is_enabled(void)
   return trace_msg_process_enabled && TRACE_is_enabled();
 }
 
+int TRACE_msg_vm_is_enabled(void)
+{
+  return trace_msg_vm_enabled && TRACE_is_enabled();
+}
+
+
 int TRACE_buffer (void)
 {
   return trace_buffer && TRACE_is_enabled();
@@ -346,6 +368,13 @@ void TRACE_global_init(int *argc, char **argv)
                    xbt_cfgelm_int, &default_tracing_msg_process, 0, 1,
                    NULL, NULL);
 
+  /* msg process */
+  int default_tracing_msg_vm = 0;
+  xbt_cfg_register(&_surf_cfg_set, OPT_TRACING_MSG_VM,
+                   "Tracing of MSG process behavior.",
+                   xbt_cfgelm_int, &default_tracing_msg_vm, 0, 1,
+                   NULL, NULL);
+
   /* tracing buffer */
   int default_buffer = 1;
   xbt_cfg_register(&_sg_cfg_set, OPT_TRACING_BUFFER,