merge conflict resolved

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

diff --git a/src/instr/instr_config.c b/src/instr/instr_config.c
index 4025598..d987722 100644 (file)
--- a/src/instr/instr_config.c
+++ b/src/instr/instr_config.c
@@ -73,7 +73,9 @@ int TRACE_start()
   TRACE_paje_start();
 
   /* activate trace */
-  xbt_assert (trace_active==0, "Tracing is already active.");
+  if (trace_active == 1){
+    THROWF (tracing_error, 0, "Tracing is already active");
+  }
   trace_active = 1;
   XBT_DEBUG ("Tracing is on");
 
@@ -104,8 +106,10 @@ int TRACE_end()
   TRACE_paje_dump_buffer(1);
 
   /* destroy all data structures of tracing (and free) */
-  destroyAllContainers();
-  instr_paje_free();
+  PJ_container_free_all();
+  PJ_type_free_all();
+  PJ_container_release();
+  PJ_type_release();
   TRACE_surf_release();
   TRACE_smpi_release();
   xbt_dict_free(&created_categories);
@@ -393,9 +397,10 @@ void TRACE_generate_triva_uncat_conf (void)
     char *name, *value;
 
     FILE *file = fopen (output, "w");
-    xbt_assert (file != NULL,
-       "Unable to open file (%s) for writing triva graph "
-       "configuration (uncategorized).", output);
+    if (file == NULL){
+      THROWF (system_error, 1, "Unable to open file (%s) for writing triva graph "
+          "configuration (uncategorized).", output);
+    }
 
     //open
     fprintf (file, "{\n");
@@ -449,9 +454,10 @@ void TRACE_generate_triva_cat_conf (void)
     }
 
     FILE *file = fopen (output, "w");
-    xbt_assert (file != NULL,
-       "Unable to open file (%s) for writing triva graph "
-       "configuration (categorized).", output);
+    if (file == NULL){
+      THROWF (system_error, 1, "Unable to open file (%s) for writing triva graph "
+          "configuration (categorized).", output);
+    }
 
     //open
     fprintf (file, "{\n");