new tracing functions to deal with trace markers

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

diff --git a/src/instr/interface.c b/src/instr/interface.c
index f4927eb..ad1d82c 100644 (file)
--- 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"
 
@@ -43,19 +37,23 @@ int TRACE_start (const char *filename)
  * \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){
+  /* checking mask */
+  if (!(mask&TRACE_PLATFORM ||
+      mask&TRACE_TASK ||
+      mask&TRACE_PROCESS ||
+      mask&TRACE_VOLUME)){
     THROW0 (tracing_error, TRACE_ERROR_MASK,
-            "Only TRACE_PLATFORM mask is accepted for now");
+          "unknown tracing mask");
   }
 
-  FILE *file = fopen(filename, "w");
+  file = fopen(filename, "w");
   if (!file) {
     THROW1 (tracing_error, TRACE_ERROR_START,
                "Tracefile %s could not be opened for writing.", filename);
@@ -78,15 +76,24 @@ int TRACE_start_with_mask(const char *filename, int mask) {
     pajeDefineVariableType ("latency", "LINK", "latency");
   }
 
-  if (IS_TRACING_PROCESSES){
+  if (IS_TRACING_PROCESSES || IS_TRACING_VOLUME){
     //processes grouped by host
     pajeDefineContainerType("PROCESS", "HOST", "PROCESS");
+  }
+
+  if (IS_TRACING_PROCESSES){
+    pajeDefineStateType("category", "PROCESS", "category");
     pajeDefineStateType("presence", "PROCESS", "presence");
   }
 
+  if (IS_TRACING_VOLUME){
+    pajeDefineLinkType ("volume", "0", "PROCESS", "PROCESS", "volume");
+  }
+
   if (IS_TRACING_TASKS){
     //tasks grouped by host
     pajeDefineContainerType("TASK", "HOST", "TASK");
+    pajeDefineStateType("category", "TASK", "category");
     pajeDefineStateType("presence", "TASK", "presence");
   }
 
@@ -104,16 +111,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;
@@ -123,6 +132,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
@@ -143,12 +153,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
@@ -169,13 +182,14 @@ 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;
 }
 
@@ -188,4 +202,20 @@ void TRACE_set_mask (int mask)
   }
 }
 
+void TRACE_declare_mark (const char *mark_type)
+{
+  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 */