bug fixes: correct use of xbt dictionaries and arrays

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

diff --git a/src/instr/interface.c b/src/instr/interface.c
index 537fbe6..323b79a 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"
 
@@ -52,7 +46,8 @@ int TRACE_start_with_mask(const char *filename, int mask) {
   /* checking mask */
   if (!(mask&TRACE_PLATFORM ||
       mask&TRACE_TASK ||
-      mask&TRACE_PROCESS)){
+      mask&TRACE_PROCESS ||
+      mask&TRACE_VOLUME)){
     THROW0 (tracing_error, TRACE_ERROR_MASK,
           "unknown tracing mask");
   }
@@ -80,15 +75,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");
   }
 
@@ -145,7 +149,8 @@ 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);
+  char *val_one = xbt_strdup ("1");
+  xbt_dict_set (defined_types, type, &val_one, xbt_free);
 }
 
 int TRACE_create_category (const char *category,
@@ -177,7 +182,8 @@ int TRACE_create_category (const char *category,
   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);
+  char *val_one = xbt_strdup ("1");
+  xbt_dict_set (created_categories, category, &val_one, xbt_free);
   return 0;
 }