#include "instr/instr_private.h"
#include "surf/surf_private.h"
+#include "surf/network_gtnets_private.h"
#ifdef HAVE_TRACING
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(instr_surf, instr, "Tracing Surf");
-static xbt_dict_t resource_variables; /* (host|link)#variable -> value */
-
-/* to trace gtnets */
-static xbt_dict_t gtnets_src; /* %p (action) -> %s */
-static xbt_dict_t gtnets_dst; /* %p (action) -> %s */
-
void TRACE_surf_alloc(void)
{
- resource_variables = xbt_dict_new();
- gtnets_src = xbt_dict_new();
- gtnets_dst = xbt_dict_new();
-
TRACE_surf_resource_utilization_alloc();
}
TRACE_surf_resource_utilization_release();
}
-static void TRACE_surf_set_resource_variable(double date,
- const char *variable,
- const char *resource,
- double value)
+void TRACE_surf_host_set_power(double date, const char *resource, double power)
{
- char aux[100], key[100];
- char *last_value = NULL;
if (!TRACE_is_active())
return;
- snprintf(aux, 100, "%f", value);
- snprintf(key, 100, "%s#%s", resource, variable);
-
- last_value = xbt_dict_get_or_null(resource_variables, key);
- if (last_value) {
- if (atof(last_value) == value) {
- return;
- }
- }
- pajeSetVariable(date, variable, resource, aux);
- xbt_dict_set(resource_variables, xbt_strdup(key), xbt_strdup(aux),
- xbt_free);
-}
-void TRACE_surf_host_set_power(double date, const char *resource,
- double power)
-{
- if (!TRACE_is_active())
- return;
- TRACE_surf_set_resource_variable(date, "power", 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, void *link,
- double bandwidth)
+void TRACE_surf_link_set_bandwidth(double date, const char *resource, double bandwidth)
{
if (!TRACE_is_active())
return;
- if (!TRACE_surf_link_is_traced(link))
- return;
- char resource[100];
- snprintf(resource, 100, "%p", link);
- TRACE_surf_set_resource_variable(date, "bandwidth", resource, bandwidth);
+ container_t container = getContainerByName(resource);
+ type_t type = getVariableType("bandwidth", NULL, container->type);
+ new_pajeSetVariable(date, container, type, bandwidth);
}
-void TRACE_surf_link_set_latency(double date, void *link, double latency)
+//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())
return;
- if (!TRACE_surf_link_is_traced(link))
- return;
- char resource[100];
- snprintf(resource, 100, "%p", link);
- TRACE_surf_set_resource_variable(date, "latency", 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)
-{
- char key[100], aux[100];
- if (!TRACE_is_active())
- return;
- snprintf(key, 100, "%p", action);
-
- snprintf(aux, 100, "%d", src);
- xbt_dict_set(gtnets_src, key, xbt_strdup(aux), xbt_free);
- snprintf(aux, 100, "%d", dst);
- xbt_dict_set(gtnets_dst, key, xbt_strdup(aux), xbt_free);
-}
-
-int TRACE_surf_gtnets_get_src(void *action)
-{
- char key[100];
- char *aux = NULL;
- if (!TRACE_is_active())
- return -1;
- snprintf(key, 100, "%p", action);
-
- aux = xbt_dict_get_or_null(gtnets_src, key);
- if (aux) {
- return atoi(aux);
- } else {
- return -1;
- }
-}
-
-int TRACE_surf_gtnets_get_dst(void *action)
+void TRACE_surf_gtnets_communicate(void *action, const char *src, const char *dst)
{
- char key[100];
- char *aux = NULL;
- if (!TRACE_is_active())
- return -1;
- snprintf(key, 100, "%p", action);
-
- aux = xbt_dict_get_or_null(gtnets_dst, key);
- if (aux) {
- return atoi(aux);
- } else {
- return -1;
- }
+ 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)
{
- char key[100];
- if (!TRACE_is_active())
- return;
- snprintf(key, 100, "%p", action);
- xbt_dict_remove(gtnets_src, key);
- xbt_dict_remove(gtnets_dst, key);
-}
-
-void TRACE_surf_host_vivaldi_parse(char *host, double x, double y,
- double h)
-{
- char valuestr[100];
- if (!TRACE_is_active() || !TRACE_platform_is_enabled())
- return;
-
- snprintf(valuestr, 100, "%g", x);
- pajeSetVariable(0, "vivaldi_x", host, valuestr);
- snprintf(valuestr, 100, "%g", y);
- pajeSetVariable(0, "vivaldi_y", host, valuestr);
- snprintf(valuestr, 100, "%g", h);
- pajeSetVariable(0, "vivaldi_h", host, valuestr);
-}
-
-extern routing_global_t global_routing;
-void TRACE_surf_save_onelink(void)
-{
- if (!TRACE_is_active())
- return;
-
- //get the onelinks from the parsed platform
- xbt_dynar_t onelink_routes = global_routing->get_onelink_routes();
- if (!onelink_routes)
- return;
-
- //save them in trace file
- onelink_t onelink;
- unsigned int iter;
- xbt_dynar_foreach(onelink_routes, iter, onelink) {
- char *src = onelink->src;
- char *dst = onelink->dst;
- void *link = onelink->link_ptr;
-
- if (TRACE_surf_link_is_traced(link)) {
- char resource[100];
- snprintf(resource, 100, "%p", link);
-
- pajeNewEvent(0, "source", resource, src);
- pajeNewEvent(0, "destination", resource, dst);
- }
- }
+ 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)
