X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0818ce4261f0fa7f8d872767471e4c2654458eb9..9a10d9dc4c75ef2443ecf56b1ef7cb0720d061b9:/src/instr/instr_paje_values.c diff --git a/src/instr/instr_paje_values.c b/src/instr/instr_paje_values.c index 382cfff2ff..b6f1e60d14 100644 --- a/src/instr/instr_paje_values.c +++ b/src/instr/instr_paje_values.c @@ -30,13 +30,28 @@ 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) +{ + xbt_ex_t e; + TRY { + return PJ_value_get(name, father); + } + CATCH(e) { + xbt_ex_free(e); + return PJ_value_new(name, color, father); + } + THROW_IMPOSSIBLE; +} + 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) { THROWF(tracing_error, 2,