A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix tracing tests
[simgrid.git]
/
src
/
instr
/
instr_paje_values.cpp
diff --git
a/src/instr/instr_paje_values.cpp
b/src/instr/instr_paje_values.cpp
index
10060e2
..
84152ec
100644
(file)
--- a/
src/instr/instr_paje_values.cpp
+++ b/
src/instr/instr_paje_values.cpp
@@
-10,11
+10,12
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY (instr_paje_values, instr, "Paje tracing event system (values)");
-s_val::s_val(const char *name, const char *color, type_t father){
+value::value(const char* name, const char* color, type_t father)
+{
if (name == nullptr || father == nullptr){
THROWF (tracing_error, 0, "can't create a value with a nullptr name (or a nullptr father)");
}
if (name == nullptr || father == nullptr){
THROWF (tracing_error, 0, "can't create a value with a nullptr name (or a nullptr father)");
}
- this->ret
= xbt_new0(s_val
, 1);
+ this->ret
= xbt_new0(value
, 1);
this->ret->name = xbt_strdup (name);
this->ret->father = father;
this->ret->color = xbt_strdup (color);
this->ret->name = xbt_strdup (name);
this->ret->father = father;
this->ret->color = xbt_strdup (color);
@@
-28,20
+29,29
@@
s_val::s_val(const char *name, const char *color, type_t father){
LogEntityValue(this->ret);
};
LogEntityValue(this->ret);
};
-val_t s_val::PJ_value_get_or_new (const char *name, const char *color, type_t father)
+value::~value()
+{
+ /* FIXME: this should be cleanable
+ xbt_free(name);
+ xbt_free(color);
+ xbt_free(id);
+ */
+}
+
+value* value::get_or_new(const char* name, const char* color, type_t father)
{
{
- val
_t
ret = 0;
+ val
ue*
ret = 0;
try {
try {
- ret =
s_val::PJ_value_
get(name, father);
+ ret =
value::
get(name, father);
}
catch(xbt_ex& e) {
}
catch(xbt_ex& e) {
-
s_val
rett(name, color, father);
+
value
rett(name, color, father);
ret = rett.ret;
}
return ret;
}
ret = rett.ret;
}
return ret;
}
-val
_t s_val::PJ_value_get (const char *
name, type_t father)
+val
ue* value::get(const char*
name, type_t father)
{
if (name == nullptr || father == nullptr){
THROWF (tracing_error, 0, "can't get a value with a nullptr name (or a nullptr father)");
{
if (name == nullptr || father == nullptr){
THROWF (tracing_error, 0, "can't get a value with a nullptr name (or a nullptr father)");
@@
-49,7
+59,7
@@
val_t s_val::PJ_value_get (const char *name, type_t father)
if (father->kind == TYPE_VARIABLE)
THROWF(tracing_error, 0, "variables can't have different values (%s)", father->name);
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);
+ val
ue* ret = (value*)xbt_dict_get_or_null
(father->values, name);
if (ret == nullptr) {
THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name);
}
if (ret == nullptr) {
THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name);
}