X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0bf95fe1cd58b85aa7bbcf61a76fb07e481d51c4..eff2324504a9161166f095f4fe512a122da6854e:/src/instr/interface.c

diff --git a/src/instr/interface.c b/src/instr/interface.c
index 55024ba33e..57157ce009 100644
--- a/src/instr/interface.c
+++ b/src/instr/interface.c
@@ -1,14 +1,8 @@
-/*
- * interface.c
- *
- *  Created on: Nov 23, 2009
- *      Author: Lucas Schnorr
- *     License: 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.
- *
- *     Copyright (c) 2009 The SimGrid team.
- */
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
+
+/* 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"
 
@@ -17,46 +11,20 @@
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(tracing,"Tracing Interface");
 
-extern xbt_dict_t created_containers; /* declared in general.c */
 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);
-}
-
-/** \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");
     return 0;
   }
 
-  /* checking if the mask is good (only TRACE_PLATFORM for now) */
-  if (mask != TRACE_PLATFORM){
-    THROW0 (tracing_error, TRACE_ERROR_MASK,
-            "Only TRACE_PLATFORM mask is accepted for now");
-  }
-
-  FILE *file = fopen(filename, "w");
+  char *filename = _TRACE_filename ();
+  file = fopen(filename, "w");
   if (!file) {
     THROW1 (tracing_error, TRACE_ERROR_START,
     		"Tracefile %s could not be opened for writing.", filename);
@@ -65,46 +33,42 @@ 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");
+  pajeDefineContainerType("LINK", "PLATFORM", "LINK");
 
-  //check if options are correct
-  if (IS_TRACING_TASKS){
-	if (!IS_TRACING_PROCESSES){
-	  TRACE_end();
-      THROW0 (tracing_error, TRACE_ERROR_MASK,
-              "TRACE_PROCESS must be enabled if TRACE_TASK is used");
-	}
+  if (IS_TRACING_PLATFORM){
+    pajeDefineVariableType ("power", "HOST", "power");
+    pajeDefineVariableType ("bandwidth", "LINK", "bandwidth");
+    pajeDefineVariableType ("latency", "LINK", "latency");
   }
 
-  if (IS_TRACING_PROCESSES|IS_TRACING_TASKS){
-	if (!IS_TRACING_PLATFORM){
-	  TRACE_end();
-      THROW0 (tracing_error, TRACE_ERROR_MASK,
-	          "TRACE_PLATFORM must be enabled if TRACE_PROCESS or TRACE_TASK is used");
-	}
+  if (IS_TRACING_PROCESSES || IS_TRACING_VOLUME){
+    //processes grouped by host
+    pajeDefineContainerType("PROCESS", "HOST", "PROCESS");
   }
 
-  //defining platform hierarchy
-  if (IS_TRACING_PLATFORM) pajeDefineContainerType("PLATFORM", "0", "platform");
-  if (IS_TRACING_PLATFORM) pajeDefineContainerType("HOST", "PLATFORM", "HOST");
-  if (IS_TRACING_PLATFORM) pajeDefineVariableType ("power", "HOST", "power");
-  if (IS_TRACING_PLATFORM) pajeDefineContainerType("LINK", "PLATFORM", "LINK");
-  if (IS_TRACING_PLATFORM) pajeDefineVariableType ("bandwidth", "LINK", "bandwidth");
-  if (IS_TRACING_PLATFORM) pajeDefineVariableType ("latency", "LINK", "latency");
+  if (IS_TRACING_PROCESSES){
+    pajeDefineStateType("category", "PROCESS", "category");
+    pajeDefineStateType("presence", "PROCESS", "presence");
+  }
 
-  if (IS_TRACING_PROCESSES) pajeDefineContainerType("PROCESS", "HOST", "PROCESS");
-  if (IS_TRACING_PROCESSES) pajeDefineStateType("presence", "PROCESS", "presence");
+  if (IS_TRACING_VOLUME){
+    pajeDefineLinkType ("volume", "0", "PROCESS", "PROCESS", "volume");
+  }
 
-  if (IS_TRACING_PROCESSES){
-	if (IS_TRACING_TASKS) pajeDefineContainerType("TASK", "PROCESS", "TASK");
-  }else{
-	if (IS_TRACING_TASKS) pajeDefineContainerType("TASK", "HOST", "TASK");
+  if (IS_TRACING_TASKS){
+    //tasks grouped by host
+    pajeDefineContainerType("TASK", "HOST", "TASK");
+    pajeDefineStateType("category", "TASK", "category");
+    pajeDefineStateType("presence", "TASK", "presence");
   }
 
-  if (IS_TRACING_PLATFORM) pajeCreateContainer(MSG_get_clock(), "platform", "PLATFORM", "0", "simgrid-platform");
+  /* creating the platform */
+  pajeCreateContainer(MSG_get_clock(), "platform", "PLATFORM", "0", "simgrid-platform");
 
-  created_containers = xbt_dict_new();
+  /* other trace initialization */
   defined_types = xbt_dict_new();
   created_categories = xbt_dict_new();
   __TRACE_msg_init();
@@ -115,16 +79,18 @@ int TRACE_start_with_mask(const char *filename, int mask) {
 }
 
 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;
@@ -134,6 +100,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
@@ -154,13 +121,16 @@ 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)
 {
-  if (!IS_TRACING) return;
+  char state[100];
+  char *val_one = NULL;
+  if (!IS_TRACING) return 1;
 
   //check if type is defined
   if (!xbt_dict_get_or_null (defined_types, type)) {
@@ -180,23 +150,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 */