void TRACE_surf_release(void)
{
TRACE_surf_resource_utilization_release();
- instr_destroy_platform();
+ destroyAllContainers();
}
static void TRACE_surf_set_resource_variable(double date,
{
char value_str[INSTR_DEFAULT_STR_SIZE];
snprintf(value_str, 100, "%f", value);
- pajeSetVariable(date, variable, resource, value_str);
+ char *variable_type = getVariableTypeIdByName(variable, getContainerByName(resource)->type);
+ pajeSetVariable(date, variable, variable_type, value_str);
}
void TRACE_surf_host_set_power(double date, const char *resource, double power)
if (!TRACE_is_active())
return;
- char *host_type = instr_host_type (resource);
- char variable_type[INSTR_DEFAULT_STR_SIZE];
- snprintf (variable_type, INSTR_DEFAULT_STR_SIZE, "power-%s", host_type);
-
+ char *variable_type = getVariableTypeIdByName("power", getContainerByName(resource)->type);
TRACE_surf_set_resource_variable(date, variable_type, resource, power);
}
if (!TRACE_is_active())
return;
- char *link_type = instr_link_type (resource);
- char variable_type[INSTR_DEFAULT_STR_SIZE];
- snprintf (variable_type, INSTR_DEFAULT_STR_SIZE, "bandwidth-%s", link_type);
-
+ char *variable_type = getVariableTypeIdByName("bandwidth", getContainerByName(resource)->type);
TRACE_surf_set_resource_variable(date, variable_type, resource, bandwidth);
}
if (!TRACE_is_active())
return;
- char *link_type = instr_link_type (resource);
- char variable_type[INSTR_DEFAULT_STR_SIZE];
- snprintf (variable_type, INSTR_DEFAULT_STR_SIZE, "latency-%s", link_type);
-
+ char *variable_type = getVariableTypeIdByName("latency", getContainerByName(resource)->type);
TRACE_surf_set_resource_variable(date, variable_type, resource, latency);
}
/* to trace gtnets */
void TRACE_surf_gtnets_communicate(void *action, int src, int dst)
{
- xbt_die ("gtnets tracing is to be udpated");
}
int TRACE_surf_gtnets_get_src(void *action)
{
- xbt_die ("gtnets tracing is to be udpated");
+ return -1;
}
int TRACE_surf_gtnets_get_dst(void *action)
{
- xbt_die ("gtnets tracing is to be udpated");
+ return -1;
}
void TRACE_surf_gtnets_destroy(void *action)
{
- xbt_die ("gtnets tracing is to be udpated");
}
void TRACE_surf_action(surf_action_t surf_action, const char *category)