X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9f3329f034f04e74f367ea33d99ab9236f04fb1c..8465282253954c58d16cb5dae9a5d064eada3329:/src/instr/instr_paje_values.c

diff --git a/src/instr/instr_paje_values.c b/src/instr/instr_paje_values.c
index 792438350c..31bf44d6d4 100644
--- a/src/instr/instr_paje_values.c
+++ b/src/instr/instr_paje_values.c
@@ -1,11 +1,10 @@
-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 2012-2014. 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/instr_private.h"
+ * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#ifdef HAVE_TRACING
+#include "instr/instr_private.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
 
@@ -30,18 +29,34 @@ val_t PJ_value_new (const char *name, const char *color, type_t father)
   return ret;
 }
 
+val_t PJ_value_get_or_new (const char *name, const char *color, type_t father)
+{
+  val_t ret = 0;
+  xbt_ex_t e;
+  TRY {
+    ret = PJ_value_get(name, father);
+  }
+  CATCH(e) {
+    xbt_ex_free(e);
+    ret = PJ_value_new(name, color, father);
+  }
+  return ret;
+}
+
 val_t PJ_value_get (const char *name, type_t father)
 {
   if (name == NULL || father == NULL){
     THROWF (tracing_error, 0, "can't get a value with a NULL name (or a NULL father)");
   }
 
-  if (father->kind == TYPE_VARIABLE) return NULL; //Variables can't have different values
+  if (father->kind == TYPE_VARIABLE)
+    THROWF(tracing_error, 0,
+           "variables can't have different values (%s)", father->name);
   val_t ret = (val_t)xbt_dict_get_or_null (father->values, name);
-  if (ret == NULL){
-    if (ret == NULL){
-      THROWF (tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name);
-    }
+  if (ret == NULL) {
+    THROWF(tracing_error, 2,
+           "value with name (%s) not found in father type (%s)",
+           name, father->name);
   }
   return ret;
 }
@@ -54,6 +69,3 @@ void PJ_value_free (val_t value)
   xbt_free(((val_t)value)->id);
   xbt_free(value);
 }
-
-
-#endif