}
XBT_DEBUG("MARK,declare %s", mark_type);
- PJ_type_get_root()->addEventType(mark_type);
+ simgrid::instr::Type::getRootType()->getOrCreateEventType(mark_type);
declared_marks.insert(mark_type);
}
if (not mark_value)
THROWF (tracing_error, 1, "mark_value is nullptr");
- simgrid::instr::Type* type = PJ_type_get_root()->byName(mark_type);
+ simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName(mark_type);
if (not type) {
THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
}
mark_color = "1.0 1.0 1.0" /*white*/;
XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color);
- simgrid::instr::Value::byNameOrCreate(mark_value, mark_color, type);
+ type->addEntityValue(mark_value, mark_color);
}
/** \ingroup TRACE_mark
THROWF (tracing_error, 1, "mark_value is nullptr");
//check if mark_type is already declared
- simgrid::instr::Type* type = PJ_type_get_root()->byName(mark_type);
+ simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName(mark_type);
if (not type) {
THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
}
XBT_DEBUG("MARK %s %s", mark_type, mark_value);
- new simgrid::instr::NewEvent(MSG_get_clock(), PJ_container_get_root(), type,
- simgrid::instr::Value::byName(mark_value, type));
+ new simgrid::instr::NewEvent(MSG_get_clock(), PJ_container_get_root(), type, type->getEntityValue(mark_value));
}
/** \ingroup TRACE_mark
std::vector<simgrid::surf::LinkImpl*> route;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(src_elm, dst_elm, &route, nullptr);
for (auto const& link : route)
- instr_user_variable(time, link->cname(), variable, father_type, value, what, nullptr, &user_link_variables);
+ instr_user_variable(time, link->getCname(), variable, father_type, value, what, nullptr, &user_link_variables);
}
/** \ingroup TRACE_API
*
* \see TRACE_host_state_declare, TRACE_host_push_state, TRACE_host_pop_state, TRACE_host_reset_state
*/
-void TRACE_host_set_state(const char* host, const char* state, const char* value_str)
+void TRACE_host_set_state(const char* host, const char* state_name, const char* value_name)
{
- container_t container = simgrid::instr::Container::byName(host);
- simgrid::instr::Type* type = container->type_->byName(state);
- simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(
- value_str, "", type); /* if user didn't declare a value with a color, use no color */
- new simgrid::instr::SetStateEvent(MSG_get_clock(), container, type, val);
+ container_t container = simgrid::instr::Container::byName(host);
+ simgrid::instr::Type* state = container->type_->byName(state_name);
+ state->addEntityValue(value_name);
+ new simgrid::instr::SetStateEvent(MSG_get_clock(), container, state, state->getEntityValue(value_name));
}
/** \ingroup TRACE_user_variables
*
* \see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_pop_state, TRACE_host_reset_state
*/
-void TRACE_host_push_state(const char* host, const char* state, const char* value_str)
+void TRACE_host_push_state(const char* host, const char* state_name, const char* value_name)
{
container_t container = simgrid::instr::Container::byName(host);
- simgrid::instr::Type* type = container->type_->byName(state);
- simgrid::instr::Value* val = simgrid::instr::Value::byNameOrCreate(
- value_str, "", type); /* if user didn't declare a value with a color, use no color */
- new simgrid::instr::PushStateEvent(MSG_get_clock(), container, type, val);
+ simgrid::instr::Type* state = container->type_->byName(state_name);
+ state->addEntityValue(value_name);
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), container, state, state->getEntityValue(value_name));
}
/** \ingroup TRACE_user_variables