[trace] encapsulating the open/close of the trace file

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

diff --git a/src/instr/instr_interface.c b/src/instr/instr_interface.c
index a9ad190..5f137ac 100644 (file)
--- a/src/instr/instr_interface.c
+++ b/src/instr/instr_interface.c
@@ -25,19 +25,7 @@ int TRACE_start()
   }
 
   /* open the trace file */
-  char *filename = TRACE_get_filename();
-  if (!filename) {
-    THROW0(tracing_error, TRACE_ERROR_START,
-           "Trace filename is not initialized.");
-    return 0;
-  }
-  FILE *file = fopen(filename, "w");
-  if (!file) {
-    THROW1(tracing_error, TRACE_ERROR_START,
-           "Tracefile %s could not be opened for writing.", filename);
-  } else {
-    TRACE_paje_start(file);
-  }
+  TRACE_paje_start();
 
   /* activate trace */
   TRACE_activate ();
@@ -55,35 +43,35 @@ int TRACE_start()
   pajeDefineEventType("source", "LINK", "source");
   pajeDefineEventType("destination", "LINK", "destination");
 
-  if (IS_TRACING_PLATFORM) {
+  if (TRACE_platform_is_enabled()) {
     if (TRACE_uncategorized()){
       pajeDefineVariableType("power_used", "HOST", "power_used");
       pajeDefineVariableType("bandwidth_used", "LINK", "bandwidth_used");
     }
   }
 
-  if (IS_TRACING_PROCESSES || IS_TRACING_VOLUME) {
+  if (TRACE_msg_process_is_enabled() || TRACE_msg_volume_is_enabled()) {
     //processes grouped by host
     pajeDefineContainerType("PROCESS", "HOST", "PROCESS");
   }
 
-  if (IS_TRACING_PROCESSES) {
+  if (TRACE_msg_process_is_enabled()) {
     pajeDefineStateType("category", "PROCESS", "category");
     pajeDefineStateType("presence", "PROCESS", "presence");
   }
 
-  if (IS_TRACING_VOLUME) {
+  if (TRACE_msg_volume_is_enabled()) {
     pajeDefineLinkType("volume", "0", "PROCESS", "PROCESS", "volume");
   }
 
-  if (IS_TRACING_TASKS) {
+  if (TRACE_msg_task_is_enabled()) {
     //tasks grouped by host
     pajeDefineContainerType("TASK", "HOST", "TASK");
     pajeDefineStateType("category", "TASK", "category");
     pajeDefineStateType("presence", "TASK", "presence");
   }
 
-  if (IS_TRACING_SMPI) {
+  if (TRACE_smpi_is_enabled()) {
     if (TRACE_smpi_is_grouped()){
       pajeDefineContainerType("MPI_PROCESS", "HOST", "MPI_PROCESS");
     }else{
@@ -113,9 +101,11 @@ int TRACE_end()
 {
   if (!TRACE_is_active())
     return 1;
-  FILE *file = TRACE_paje_end();
-  fclose(file);
 
+  /* close the trace file */
+  TRACE_paje_end();
+
+  /* activate trace */
   TRACE_desactivate ();
   return 0;
 }
@@ -160,14 +150,14 @@ void TRACE_define_type(const char *type,
   pajeDefineContainerType(type, parent_type, type);
   if (final) {
     //for m_process_t
-    if (IS_TRACING_PROCESSES)
+    if (TRACE_msg_process_is_enabled())
       pajeDefineContainerType("process", type, "process");
-    if (IS_TRACING_PROCESSES)
+    if (TRACE_msg_process_is_enabled())
       pajeDefineStateType("process-state", "process", "process-state");
 
-    if (IS_TRACING_TASKS)
+    if (TRACE_msg_task_is_enabled())
       pajeDefineContainerType("task", type, "task");
-    if (IS_TRACING_TASKS)
+    if (TRACE_msg_task_is_enabled())
       pajeDefineStateType("task-state", "task", "task-state");
   }
   val_one = xbt_strdup("1");
@@ -224,10 +214,10 @@ int TRACE_create_category_with_color(const char *category,
 
   /* for registering application categories on top of platform */
   snprintf(state, 100, "b%s", category);
-  if (IS_TRACING_PLATFORM)
+  if (TRACE_platform_is_enabled())
     pajeDefineVariableTypeWithColor(state, "LINK", state, final_color);
   snprintf(state, 100, "p%s", category);
-  if (IS_TRACING_PLATFORM)
+  if (TRACE_platform_is_enabled())
     pajeDefineVariableTypeWithColor(state, "HOST", state, final_color);
 
   val_one = xbt_strdup("1");