if (!value)
return;
//only trace link utilization if link is known by tracing mechanism
- if (!getContainerByName(resource))
+ if (!knownContainerWithName(resource))
return;
if (!value)
return;
//trace uncategorized link utilization
if (TRACE_uncategorized()){
- DEBUG4("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now+delta, resource, value);
+ XBT_DEBUG("UNCAT LINK [%f - %f] %s bandwidth_used %f", now, now+delta, resource, value);
container_t container = getContainerByName (resource);
type_t type = getVariableType("bandwidth_used", NULL, container->type);
TRACE_surf_resource_utilization_event(smx_action, now, delta, type->name, container->name, value);
if (TRACE_categorized()){
if (!surf_action->category)
return;
- DEBUG5("CAT LINK [%f - %f] %s %s %f", now, now+delta, resource, surf_action->category, value);
+ //variable of this category starts by 'b', because we have a link here
+ char category_type[INSTR_DEFAULT_STR_SIZE];
+ snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "b%s", surf_action->category);
+ XBT_DEBUG("CAT LINK [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
container_t container = getContainerByName (resource);
- type_t type = getVariableType(surf_action->category, NULL, container->type);
+ type_t type = getVariableType(category_type, NULL, container->type);
TRACE_surf_resource_utilization_event(smx_action, now, delta, type->name, container->name, value);
}
return;
{
if (!TRACE_is_active())
return;
+ //only trace host utilization if host is known by tracing mechanism
+ if (!knownContainerWithName(resource))
+ return;
if (!value)
return;
//trace uncategorized host utilization
if (TRACE_uncategorized()){
- DEBUG4("UNCAT HOST [%f - %f] %s power_used %f", now, now+delta, resource, value);
+ XBT_DEBUG("UNCAT HOST [%f - %f] %s power_used %f", now, now+delta, resource, value);
container_t container = getContainerByName (resource);
type_t type = getVariableType("power_used", NULL, container->type);
TRACE_surf_resource_utilization_event(smx_action, now, delta, type->name, container->name, value);
if (TRACE_categorized()){
if (!surf_action->category)
return;
- DEBUG5("CAT HOST [%f - %f] %s %s %f", now, now+delta, resource, surf_action->category, value);
+ //variable of this category starts by 'p', because we have a host here
+ char category_type[INSTR_DEFAULT_STR_SIZE];
+ snprintf (category_type, INSTR_DEFAULT_STR_SIZE, "p%s", surf_action->category);
+ XBT_DEBUG("CAT HOST [%f - %f] %s %s %f", now, now+delta, resource, category_type, value);
container_t container = getContainerByName (resource);
- type_t type = getVariableType(surf_action->category, NULL, container->type);
+ type_t type = getVariableType(category_type, NULL, container->type);
TRACE_surf_resource_utilization_event(smx_action, now, delta, type->name, container->name, value);
}
return;
{
if (!TRACE_is_active())
return;
- DEBUG1("START %p", action);
+ XBT_DEBUG("START %p", action);
TRACE_method_start(action);
}
{
if (!TRACE_is_active())
return;
- DEBUG6("EVENT %p [%f - %f] %s %s %f", action, now, now+delta, resource, variable, value);
+ XBT_DEBUG("EVENT %p [%f - %f] %s %s %f", action, now, now+delta, resource, variable, value);
TRACE_method_event(action, now, delta, variable, resource, value);
}
if (!TRACE_is_active())
return;
TRACE_method_end(action);
- DEBUG1("END %p", action);
+ XBT_DEBUG("END %p", action);
}
void TRACE_surf_resource_utilization_release()