// check if key exists: if it doesn't, set the variable to zero and mark this in the dict
if (platform_variables.find(key) == platform_variables.end()) {
container_t container = PJ_container_get (resource);
- type_t type = PJ_type_get (variable, container->type);
- new SetVariableEvent (now, container, type, 0);
+ simgrid::instr::Type* type = PJ_type_get(variable, container->type_);
+ new simgrid::instr::SetVariableEvent(now, container, type, 0);
platform_variables[key] = std::string("");
}
}
-static void instr_event (double now, double delta, type_t variable, container_t resource, double value)
+static void instr_event(double now, double delta, simgrid::instr::Type* variable, container_t resource, double value)
{
- __TRACE_surf_check_variable_set_to_zero(now, variable->name, resource->name);
- new AddVariableEvent(now, resource, variable, value);
- new SubVariableEvent(now + delta, resource, variable, value);
+ __TRACE_surf_check_variable_set_to_zero(now, variable->name_, resource->name_);
+ new simgrid::instr::AddVariableEvent(now, resource, variable, value);
+ new simgrid::instr::SubVariableEvent(now + delta, resource, variable, value);
}
/* TRACE_surf_link_set_utilization: entry point from SimGrid */
if (TRACE_uncategorized()){
XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now+delta, resource, value);
container_t container = PJ_container_get (resource);
- type_t type = PJ_type_get ("bandwidth_used", container->type);
+ simgrid::instr::Type* type = PJ_type_get("bandwidth_used", container->type_);
instr_event (now, delta, type, container, value);
}
snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", category);
XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
container_t container = PJ_container_get (resource);
- type_t type = PJ_type_get (category_type, container->type);
+ simgrid::instr::Type* type = PJ_type_get(category_type, container->type_);
instr_event (now, delta, type, container, value);
}
}
//trace uncategorized host utilization
if (TRACE_uncategorized()){
XBT_DEBUG("UNCAT HOST [%f - %f] %s power_used %f", now, now+delta, resource, value);
- type_t type = PJ_type_get ("power_used", container->type);
+ simgrid::instr::Type* type = PJ_type_get("power_used", container->type_);
instr_event (now, delta, type, container, value);
}
char category_type[INSTR_DEFAULT_STR_SIZE];
snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", category);
XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
- type_t type = PJ_type_get (category_type, container->type);
+ simgrid::instr::Type* type = PJ_type_get(category_type, container->type_);
instr_event (now, delta, type, container, value);
}
}