X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..21b9c5dd068c05fbac421c871f809616b9c6535b:/src/instr/interface.c

diff --git a/src/instr/interface.c b/src/instr/interface.c
index 7435699526..88a057681b 100644
--- a/src/instr/interface.c
+++ b/src/instr/interface.c
@@ -14,44 +14,26 @@ 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) {
   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 *file = fopen(filename, "w");
   if (!file) {
     THROW1 (tracing_error, TRACE_ERROR_START,
@@ -61,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");
@@ -96,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");
 
@@ -105,21 +90,24 @@ 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;
 }
 
 int TRACE_end() {
+	FILE *file = NULL;
   if (!IS_TRACING) return 1;
-  FILE *file = TRACE_paje_end();
+  file = TRACE_paje_end();
   fclose (file);
   return 0;
 }
 
 int TRACE_category (const char *category)
 {
-  if (!IS_TRACING) return 1;
   static int first_time = 1;
+  if (!IS_TRACING) return 1;
+
   if (first_time){
 	  TRACE_define_type ("user_type", "0", 1);
 	  first_time = 0;
@@ -129,6 +117,7 @@ int TRACE_category (const char *category)
 
 void TRACE_define_type (const char *type,
 		const char *parent_type, int final) {
+	char *val_one = NULL;
   if (!IS_TRACING) return;
 
   //check if type is already defined
@@ -149,12 +138,15 @@ void TRACE_define_type (const char *type,
     if (IS_TRACING_TASKS) pajeDefineContainerType ("task", type, "task");
     if (IS_TRACING_TASKS) pajeDefineStateType ("task-state", "task", "task-state");
   }
-  xbt_dict_set (defined_types, type, xbt_strdup("1"), xbt_free);
+  val_one = xbt_strdup ("1");
+  xbt_dict_set (defined_types, type, &val_one, xbt_free);
 }
 
 int TRACE_create_category (const char *category,
 		const char *type, const char *parent_category)
 {
+  char state[100];
+  char *val_one = NULL;
   if (!IS_TRACING) return 1;
 
   //check if type is defined
@@ -175,23 +167,31 @@ int TRACE_create_category (const char *category,
   pajeCreateContainer(MSG_get_clock(), category, type, parent_category, category);
 
   /* for registering application categories on top of platform */
-  char state[100];
+
   snprintf (state, 100, "b%s", category);
   if (IS_TRACING_PLATFORM) pajeDefineVariableType (state, "LINK", state);
   snprintf (state, 100, "p%s", category);
   if (IS_TRACING_PLATFORM) pajeDefineVariableType (state, "HOST", state);
 
-  xbt_dict_set (created_categories, category, xbt_strdup("1"), xbt_free);
+  val_one = xbt_strdup ("1");
+  xbt_dict_set (created_categories, category, &val_one, xbt_free);
   return 0;
 }
 
-void TRACE_set_mask (int mask)
+void TRACE_declare_mark (const char *mark_type)
 {
-  if (mask != TRACE_PLATFORM){
-     return;
-  }else{
-     trace_mask = mask;
-  }
+  if (!IS_TRACING) return;
+  if (!mark_type) return;
+
+  pajeDefineEventType (mark_type, "0", mark_type);
+}
+
+void TRACE_mark (const char *mark_type, const char *mark_value)
+{
+  if (!IS_TRACING) return;
+  if (!mark_type || !mark_value) return;
+
+  pajeNewEvent (MSG_get_clock(), mark_type, "0", mark_value);
 }
 
 #endif /* HAVE_TRACING */