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
use a proper destructor for the paje::value type
[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
d07eb6f
..
f46eed5
100644
(file)
--- a/
src/instr/instr_paje_values.cpp
+++ b/
src/instr/instr_paje_values.cpp
@@
-10,40
+10,46
@@
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)");
-val
_t PJ_value_new (const char *name, const char *
color, type_t father)
+val
ue::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)");
}
-
- val_t ret = xbt_new0(s_val_t, 1);
- ret->name = xbt_strdup (name);
- ret->father = father;
- ret->color = xbt_strdup (color);
+ this->ret = xbt_new0(value, 1);
+ this->ret->name = xbt_strdup (name);
+ this->ret->father = father;
+ this->ret->color = xbt_strdup (color);
char str_id[INSTR_DEFAULT_STR_SIZE];
snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", instr_new_paje_id());
char str_id[INSTR_DEFAULT_STR_SIZE];
snprintf (str_id, INSTR_DEFAULT_STR_SIZE, "%lld", instr_new_paje_id());
- ret->id = xbt_strdup (str_id);
+
this->
ret->id = xbt_strdup (str_id);
xbt_dict_set (father->values, name, ret, nullptr);
XBT_DEBUG("new value %s, child of %s", ret->name, ret->father->name);
xbt_dict_set (father->values, name, ret, nullptr);
XBT_DEBUG("new value %s, child of %s", ret->name, ret->father->name);
- new DefineEntityValueEvent(ret);
- return ret;
+ LogEntityValue(this->ret);
+};
+
+value::~value()
+{
+ xbt_free(name);
+ xbt_free(color);
+ xbt_free(id);
}
}
-val
_t PJ_value_get_or_new (const char *name, const char *
color, type_t father)
+val
ue* value::get_or_new(const char* name, const char*
color, type_t father)
{
{
- val
_t
ret = 0;
+ val
ue*
ret = 0;
try {
try {
- ret =
PJ_value_
get(name, father);
+ ret =
value::
get(name, father);
}
catch(xbt_ex& e) {
}
catch(xbt_ex& e) {
- ret = PJ_value_new(name, color, father);
+ value rett(name, color, father);
+ ret = rett.ret;
}
return ret;
}
}
return ret;
}
-val
_t 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)");
@@
-51,18
+57,9
@@
val_t 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);
}
return ret;
}
if (ret == nullptr) {
THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name);
}
return ret;
}
-
-void PJ_value_free (val_t value)
-{
- XBT_DEBUG("free value %s, child of %s", value->name, value->father->name);
- xbt_free(((val_t)value)->name);
- xbt_free(((val_t)value)->color);
- xbt_free(((val_t)value)->id);
- xbt_free(value);
-}