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
sloppy replacement of dict by map and char* by string
[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
f07a640
..
e4a1f7b
100644
(file)
--- a/
src/instr/instr_paje_values.cpp
+++ b/
src/instr/instr_paje_values.cpp
@@
-10,59
+10,52
@@
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)
+
simgrid::instr::Value::Value(const char* name, const char* color, simgrid::instr::Type* father) : father_(
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->name_ = xbt_strdup(name);
+ this->color_ = xbt_strdup(color);
- val_t ret = xbt_new0(s_val_t, 1);
- ret->name = xbt_strdup (name);
- ret->father = father;
- ret->color = xbt_strdup (color);
+ this->id_ = bprintf("%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);
+ xbt_dict_set(father->values_, name, this, nullptr);
+ XBT_DEBUG("new value %s, child of %s", name_, father_->name_);
+ LogEntityValue(this);
+};
- xbt_dict_set (father->values, name, ret, nullptr);
- XBT_DEBUG("new value %s, child of %s", ret->name, ret->father->name);
- DefineEntityValueEvent(ret);
- return ret;
+simgrid::instr::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)
+simgrid::instr::Value* simgrid::instr::Value::get_or_new(const char* name, const char* color,
+ simgrid::instr::Type* father)
{
{
-
val_t
ret = 0;
+
Value*
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);
+ ret =
new Value
(name, color, father);
}
return ret;
}
}
return ret;
}
-
val_t PJ_value_get (const char *name, type_t
father)
+
simgrid::instr::Value* simgrid::instr::Value::get(const char* name, Type*
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)");
}
- 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 (father->kind
_
== TYPE_VARIABLE)
+ THROWF(tracing_error, 0, "variables can't have different values (%s)", father->name
_
);
+
Value* ret = (Value*)xbt_dict_get_or_null(father->values_
, name);
if (ret == nullptr) {
if (ret == nullptr) {
- THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name);
+ THROWF(tracing_error, 2, "value with name (%s) not found in father type (%s)", name, father->name
_
);
}
return ret;
}
}
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);
-}