return nullptr;
xbt_dynar_t ret = xbt_dynar_new (sizeof(char*), &xbt_free_ref);
- for (auto name : *filter)
+ for (auto const& name : *filter)
xbt_dynar_push_as(ret, char*, xbt_strdup(name.c_str()));
return ret;
}
XBT_DEBUG("MARK,declare %s", mark_type);
- s_type::s_type_event_new(mark_type, PJ_type_get_root());
+ simgrid::instr::Type::eventNew(mark_type, PJ_type_get_root());
declared_marks.insert(mark_type);
}
if (not mark_value)
THROWF (tracing_error, 1, "mark_value is nullptr");
- type_t type = PJ_type_get (mark_type, PJ_type_get_root());
+ simgrid::instr::Type* type = PJ_type_get_root()->getChild(mark_type);
if (not type) {
THROWF (tracing_error, 1, "mark_type with name (%s) is not declared", mark_type);
}
mark_color = white;
XBT_DEBUG("MARK,declare_value %s %s %s", mark_type, mark_value, mark_color);
- value rett(mark_value, mark_color, type);
+ new simgrid::instr::Value(mark_value, mark_color, type);
}
/** \ingroup TRACE_mark
THROWF (tracing_error, 1, "mark_value is nullptr");
//check if mark_type is already declared
- type_t type = PJ_type_get (mark_type, PJ_type_get_root());
+ simgrid::instr::Type* type = PJ_type_get_root()->getChild(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 NewEvent(MSG_get_clock(), PJ_container_get_root(), type, value::get(mark_value, type));
+ new simgrid::instr::NewEvent(MSG_get_clock(), PJ_container_get_root(), type,
+ simgrid::instr::Value::get(mark_value, type));
}
/** \ingroup TRACE_mark
char valuestr[100];
snprintf(valuestr, 100, "%g", value);
container_t container = PJ_container_get(resource);
- type_t type = PJ_type_get (variable, container->type);
+ simgrid::instr::Type* type = container->type_->getChild(variable);
switch (what){
case INSTR_US_SET:
- new SetVariableEvent(time, container, type, value);
+ new simgrid::instr::SetVariableEvent(time, container, type, value);
break;
case INSTR_US_ADD:
- new AddVariableEvent(time, container, type, value);
+ new simgrid::instr::AddVariableEvent(time, container, type, value);
break;
case INSTR_US_SUB:
- new SubVariableEvent(time, container, type, value);
+ new simgrid::instr::SubVariableEvent(time, container, type, value);
break;
default:
THROW_IMPOSSIBLE;
std::vector<simgrid::surf::LinkImpl*> route;
simgrid::kernel::routing::NetZoneImpl::getGlobalRoute(src_elm, dst_elm, &route, nullptr);
- for (auto link : route)
+ for (auto const& link : route)
instr_user_variable(time, link->cname(), variable, father_type, value, what, nullptr, &user_link_variables);
}
void TRACE_host_set_state(const char* host, const char* state, const char* value_str)
{
container_t container = PJ_container_get(host);
- type_t type = PJ_type_get (state, container->type);
- value* val =
- value::get_or_new(value_str, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */
- new SetStateEvent(MSG_get_clock(), container, type, val);
+ simgrid::instr::Type* type = container->type_->getChild(state);
+ simgrid::instr::Value* val = simgrid::instr::Value::get_or_new(
+ value_str, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */
+ new simgrid::instr::SetStateEvent(MSG_get_clock(), container, type, val);
}
/** \ingroup TRACE_user_variables
void TRACE_host_push_state(const char* host, const char* state, const char* value_str)
{
container_t container = PJ_container_get(host);
- type_t type = PJ_type_get (state, container->type);
- value* val =
- value::get_or_new(value_str, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */
- new PushStateEvent(MSG_get_clock(), container, type, val);
+ simgrid::instr::Type* type = container->type_->getChild(state);
+ simgrid::instr::Value* val = simgrid::instr::Value::get_or_new(
+ value_str, nullptr, type); /* if user didn't declare a value with a color, use nullptr color */
+ new simgrid::instr::PushStateEvent(MSG_get_clock(), container, type, val);
}
/** \ingroup TRACE_user_variables
void TRACE_host_pop_state (const char *host, const char *state)
{
container_t container = PJ_container_get(host);
- type_t type = PJ_type_get (state, container->type);
- new PopStateEvent(MSG_get_clock(), container, type);
+ simgrid::instr::Type* type = container->type_->getChild(state);
+ new simgrid::instr::PopStateEvent(MSG_get_clock(), container, type);
}
/** \ingroup TRACE_API