X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8c33af2f92672622596e7952abdea8f090bf9f72..65e338fbfd769d49b29242bfe56cde18c03b6074:/src/instr/interface.c

diff --git a/src/instr/interface.c b/src/instr/interface.c
index f41ecc7de3..7c42143468 100644
--- a/src/instr/interface.c
+++ b/src/instr/interface.c
@@ -4,56 +4,38 @@
 /* This program is free software; you can redistribute it and/or modify it
   * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "instr/private.h"
-
+#include "simgrid_config.h"
 
 #ifdef HAVE_TRACING
 
+#include "instr/private.h"
+
 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 +44,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 +76,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");
 
@@ -104,8 +89,10 @@ int TRACE_start_with_mask(const char *filename, int mask) {
   defined_types = xbt_dict_new();
   created_categories = xbt_dict_new();
   __TRACE_msg_init();
+  __TRACE_category_init ();
   __TRACE_surf_init();
   __TRACE_msg_process_init ();
+  __TRACE_smpi_init ();
 
   return 0;
 }
@@ -193,12 +180,33 @@ int TRACE_create_category (const char *category,
   return 0;
 }
 
-void TRACE_set_mask (int mask)
+void TRACE_declare_mark (const char *mark_type)
 {
-  if (mask != TRACE_PLATFORM){
-     return;
+  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);
+}
+
+int TRACE_smpi_set_category (const char *category)
+{
+  //if category is NULL, trace of platform is disabled
+  if (!IS_TRACING) return 1;
+  if (category != NULL){
+    int ret = TRACE_category (category);
+    __TRACE_category_set (SIMIX_process_self(), category);
+    return ret;
   }else{
-     trace_mask = mask;
+    __TRACE_category_unset (SIMIX_process_self());
+    return 0;
   }
 }