X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea5d4ac6b57a3771a16f9a998179688088f8b96c..92959d5b26387e5194b1bb4553baf90da7701f41:/src/instr/instr_paje_values.c

diff --git a/src/instr/instr_paje_values.c b/src/instr/instr_paje_values.c
index da52f143c6..a2e5748c63 100644
--- a/src/instr/instr_paje_values.c
+++ b/src/instr/instr_paje_values.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 2012-2013. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -11,6 +11,10 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event s
 
 val_t PJ_value_new (const char *name, const char *color, type_t father)
 {
+  if (name == NULL || father == NULL){
+    THROWF (tracing_error, 0, "can't create a value with a NULL name (or a NULL father)");
+  }
+
   val_t ret = xbt_new0(s_val_t, 1);
   ret->name = xbt_strdup (name);
   ret->father = father;
@@ -26,12 +30,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 (father->kind == TYPE_VARIABLE) return NULL; //Variables can't have different values
+  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)
+    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){
-    return NULL;
+  if (ret == NULL) {
+    THROWF(tracing_error, 2,
+           "value with name (%s) not found in father type (%s)",
+           name, father->name);
   }
   return ret;
 }