trace: functions to generate links, append a link type in the hierarchy of types

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

diff --git a/src/instr/interface.c b/src/instr/interface.c
index ad1d82c..88a0576 100644 (file)
--- a/src/instr/interface.c
+++ b/src/instr/interface.c
@@ -14,46 +14,27 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(tracing,"Tracing Interface");
 static xbt_dict_t defined_types;
 static xbt_dict_t created_categories;
 
-int trace_mask;
-
-/** \ingroup tracing
- * \brief Simple initialization of tracing.
- *
- * \param filename of the file that will contain the traces
- * \return 0 if everything is ok
- */
-int TRACE_start (const char *filename)
+int TRACE_start ()
 {
-  return TRACE_start_with_mask (filename, TRACE_PLATFORM);
-}
+  if (!_TRACE_configured()){
+    THROW0 (tracing_error, TRACE_ERROR_START,
+            "TRACE_start should be called after SimGrid initialization functions.");
+    return 0;
+  }
 
-/** \ingroup tracing
- * \brief Initialization of tracing.
- *
- * Function to be called at first when tracing a simulation
- *
- * \param name of the file that will contain the traces
- * \param mask to take into account during trace
- * \return 0 if everything is ok
- */
-int TRACE_start_with_mask(const char *filename, int mask) {
-       FILE *file = NULL;
   if (IS_TRACING) { /* what? trace is already active... ignore.. */
-       THROW0 (tracing_error, TRACE_ERROR_START,
-               "TRACE_start called, but tracing is already active");
+    THROW0 (tracing_error, TRACE_ERROR_START,
+                "TRACE_start called, but tracing is already active.");
     return 0;
   }
 
-  /* checking mask */
-  if (!(mask&TRACE_PLATFORM ||
-      mask&TRACE_TASK ||
-      mask&TRACE_PROCESS ||
-      mask&TRACE_VOLUME)){
-    THROW0 (tracing_error, TRACE_ERROR_MASK,
-          "unknown tracing mask");
+  char *filename = _TRACE_filename ();
+  if (!filename){
+    THROW0 (tracing_error, TRACE_ERROR_START,
+            "Trace filename is not initialized.");
+    return 0;
   }
-
-  file = fopen(filename, "w");
+  FILE *file = fopen(filename, "w");
   if (!file) {
     THROW1 (tracing_error, TRACE_ERROR_START,
                "Tracefile %s could not be opened for writing.", filename);
@@ -62,9 +43,6 @@ int TRACE_start_with_mask(const char *filename, int mask) {
   }
   TRACE_paje_create_header();
 
-  /* setting the mask */
-  trace_mask = mask;
-
   /* define paje hierarchy for tracing */
   pajeDefineContainerType("PLATFORM", "0", "platform");
   pajeDefineContainerType("HOST", "PLATFORM", "HOST");
@@ -97,6 +75,12 @@ int TRACE_start_with_mask(const char *filename, int mask) {
     pajeDefineStateType("presence", "TASK", "presence");
   }
 
+  if (IS_TRACING_SMPI){
+    pajeDefineContainerType ("MPI_PROCESS", "HOST", "MPI_PROCESS");
+    pajeDefineStateType ("MPI_STATE", "MPI_PROCESS", "MPI_STATE");
+    pajeDefineLinkType ("MPI_LINK", "0", "MPI_PROCESS", "MPI_PROCESS", "MPI_LINK");
+  }
+
   /* creating the platform */
   pajeCreateContainer(MSG_get_clock(), "platform", "PLATFORM", "0", "simgrid-platform");
 
@@ -106,6 +90,7 @@ int TRACE_start_with_mask(const char *filename, int mask) {
   __TRACE_msg_init();
   __TRACE_surf_init();
   __TRACE_msg_process_init ();
+  __TRACE_smpi_init ();
 
   return 0;
 }
@@ -193,15 +178,6 @@ int TRACE_create_category (const char *category,
   return 0;
 }
 
-void TRACE_set_mask (int mask)
-{
-  if (mask != TRACE_PLATFORM){
-     return;
-  }else{
-     trace_mask = mask;
-  }
-}
-
 void TRACE_declare_mark (const char *mark_type)
 {
   if (!IS_TRACING) return;