#include "instr/instr_private.h"
#include "surf/surf_private.h"
+#include "surf/network_gtnets_private.h"
#ifdef HAVE_TRACING
void TRACE_surf_release(void)
{
TRACE_surf_resource_utilization_release();
- instr_destroy_platform();
-}
-
-static void TRACE_surf_set_resource_variable(double date,
- const char *variable,
- const char *resource,
- double value)
-{
- char value_str[INSTR_DEFAULT_STR_SIZE];
- snprintf(value_str, 100, "%f", value);
- pajeSetVariable(date, variable, instr_id(resource), value_str);
}
void TRACE_surf_host_set_power(double date, const char *resource, double power)
{
- if (!TRACE_is_active())
+ if (!TRACE_is_enabled())
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);
-
- TRACE_surf_set_resource_variable(date, variable_type, resource, power);
+ container_t container = getContainerByName(resource);
+ type_t type = getVariableType("power", NULL, container->type);
+ new_pajeSetVariable(date, container, type, power);
}
void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
{
- if (!TRACE_is_active())
+ if (!TRACE_is_enabled())
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);
-
- TRACE_surf_set_resource_variable(date, variable_type, resource, bandwidth);
+ container_t container = getContainerByName(resource);
+ type_t type = getVariableType("bandwidth", NULL, container->type);
+ new_pajeSetVariable(date, container, type, bandwidth);
}
//FIXME: this function is not used (latency availability traces support exists in surf network models?)
void TRACE_surf_link_set_latency(double date, const char *resource, double latency)
{
- if (!TRACE_is_active())
+ if (!TRACE_is_enabled())
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);
-
- TRACE_surf_set_resource_variable(date, variable_type, resource, latency);
+ container_t container = getContainerByName(resource);
+ type_t type = getVariableType("latency", NULL, container->type);
+ new_pajeSetVariable(date, container, type, 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");
-}
-
-int TRACE_surf_gtnets_get_dst(void *action)
+void TRACE_surf_gtnets_communicate(void *action, const char *src, const char *dst)
{
- xbt_die ("gtnets tracing is to be udpated");
+ surf_action_network_GTNETS_t gtnets_action = (surf_action_network_GTNETS_t)action;
+ gtnets_action->src_name = xbt_strdup (src);
+ gtnets_action->dst_name = xbt_strdup (dst);
}
void TRACE_surf_gtnets_destroy(void *action)
{
- xbt_die ("gtnets tracing is to be udpated");
+ surf_action_network_GTNETS_t gtnets_action = (surf_action_network_GTNETS_t)action;
+ xbt_free (gtnets_action->src_name);
+ xbt_free (gtnets_action->dst_name);
}
void TRACE_surf_action(surf_action_t surf_action, const char *category)
{
- if (!TRACE_is_active())
+ if (!TRACE_is_enabled())
return;
if (!TRACE_categorized ())
return;