if (not mark_value)
THROWF (tracing_error, 1, "mark_value is nullptr");
- simgrid::instr::Type* type = simgrid::instr::Type::getRootType()->byName(mark_type);
+ simgrid::instr::EventType* type =
+ static_cast<simgrid::instr::EventType*>(simgrid::instr::Type::getRootType()->byName(mark_type));
if (not type) {
THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
- }
-
- if (not mark_color)
- mark_color = "1.0 1.0 1.0" /*white*/;
+ } else {
+ if (not mark_color)
+ mark_color = "1.0 1.0 1.0" /*white*/;
- XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color);
- type->addEntityValue(mark_value, mark_color);
+ XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color);
+ 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 = simgrid::instr::Type::getRootType()->byName(mark_type);
+ simgrid::instr::EventType* type =
+ static_cast<simgrid::instr::EventType*>(simgrid::instr::Type::getRootType()->byName(mark_type));
if (not type) {
THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
+ } else {
+ XBT_DEBUG("MARK %s %s", mark_type, mark_value);
+ new simgrid::instr::NewEvent(MSG_get_clock(), simgrid::instr::Container::getRootContainer(), type,
+ type->getEntityValue(mark_value));
}
-
- XBT_DEBUG("MARK %s %s", mark_type, mark_value);
- new simgrid::instr::NewEvent(MSG_get_clock(), PJ_container_get_root(), type, type->getEntityValue(mark_value));
}
/** \ingroup TRACE_mark
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* state = container->type_->byName(state_name);
+ simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName(state_name));
state->addEntityValue(value_name);
- new simgrid::instr::SetStateEvent(MSG_get_clock(), container, state, state->getEntityValue(value_name));
+ state->setEvent(MSG_get_clock(), container, value_name);
}
/** \ingroup TRACE_user_variables
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* state = container->type_->byName(state_name);
+ simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName(state_name));
state->addEntityValue(value_name);
- new simgrid::instr::PushStateEvent(MSG_get_clock(), container, state, state->getEntityValue(value_name));
+ state->pushEvent(MSG_get_clock(), container, value_name);
}
/** \ingroup TRACE_user_variables
*
* \see TRACE_host_state_declare, TRACE_host_set_state, TRACE_host_push_state, TRACE_host_reset_state
*/
-void TRACE_host_pop_state (const char *host, const char *state)
+void TRACE_host_pop_state(const char* host, const char* state_name)
{
container_t container = simgrid::instr::Container::byName(host);
- simgrid::instr::Type* type = container->type_->byName(state);
- new simgrid::instr::PopStateEvent(MSG_get_clock(), container, type);
+ simgrid::instr::StateType* state = static_cast<simgrid::instr::StateType*>(container->type_->byName(state_name));
+ state->popEvent(MSG_get_clock(), container);
}
/** \ingroup TRACE_API