-/*
- * surf.c
- *
- * Created on: Nov 27, 2009
- * Author: Lucas Schnorr
- * License: This program is free software; you can redistribute
- * it and/or modify it under the terms of the license
- * (GNU LGPL) which comes with this package.
- *
- * Copyright (c) 2009 The SimGrid team.
- */
+/* Copyright (c) 2010. The SimGrid Team.
+ * All rights reserved. */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
#include "instr/private.h"
static xbt_dict_t hosts_id;
static xbt_dict_t created_links;
-static xbt_dict_t link_bandwidth;
-static xbt_dict_t link_latency;
+static xbt_dict_t link_bandwidth; //name(char*) -> bandwidth(double)
+static xbt_dict_t link_latency; //name(char*) -> latency(double)
static xbt_dict_t host_containers;
-//static xbt_dict_t platform_variable_last_value; /* to control the amount of add/sub variables events*/
-//static xbt_dict_t platform_variable_last_time; /* to control the amount of add/sub variables events*/
static xbt_dict_t last_platform_variables; /* to control the amount of add/sub variables events:
dict with key {RESOURCE_NAME}#Time or {RESOURCE_NAME}#Value of dict with variables types == string */
link_latency = xbt_dict_new();
platform_variables = xbt_dict_new();
host_containers = xbt_dict_new();
-
- //platform_variable_last_value = xbt_dict_new();
- //platform_variable_last_time = xbt_dict_new();
-
last_platform_variables = xbt_dict_new();
-
resource_variables = xbt_dict_new ();
-
gtnets_src = xbt_dict_new ();
gtnets_dst = xbt_dict_new ();
}
static char *strsplit (char *input, int field, char del) //caller should free the returned string
{
+ char *ret = NULL;
int length = strlen(input), i;
int s = 0, e = length+1;
int current_field = 0;
}
}
//copy string from s to e (with length equal to e-s) and return
- char *ret = malloc ((e-s+2)*sizeof(char));
+ ret = malloc ((e-s+2)*sizeof(char));
strncpy (ret, input+s, e-s+1);
ret[e-s+1] = '\0';
return ret;
void __TRACE_surf_finalize (void)
{
+ xbt_dict_cursor_t cursor = NULL;
+ unsigned int cursor_ar = 0;
+ char *key, *value, *res;
+ char *resource;
+ char *aux = NULL;
+ char *var_cpy = NULL;
+ xbt_dynar_t resources = NULL;
if (!IS_TRACING_PLATFORM) return;
if (!xbt_dict_length(last_platform_variables)){
return;
}else{
- xbt_dict_cursor_t cursor = NULL;
- unsigned int cursor_ar = 0;
- char *key, *value, *res;
- char resource[200];
-
/* get all resources from last_platform_variables */
- xbt_dynar_t resources = xbt_dynar_new(sizeof(char)*200, xbt_free);
+ resources = xbt_dynar_new(sizeof(char*), xbt_free);
xbt_dict_foreach(last_platform_variables, cursor, key, value) {
res = strsplit (key, 0, VARIABLE_SEPARATOR);
- char *aux = strsplit (key, 1, VARIABLE_SEPARATOR);
+ aux = strsplit (key, 1, VARIABLE_SEPARATOR);
if (strcmp (aux, "Time") == 0){ //only need to add one of three
- xbt_dynar_push (resources, xbt_strdup(res));
+ var_cpy = xbt_strdup (res);
+ xbt_dynar_push (resources, &var_cpy);
}
free (aux);
free (res);
/* iterate through resources array */
xbt_dynar_foreach (resources, cursor_ar, resource) {
char timekey[100], valuekey[100], variablekey[100];
+ char *time = NULL;
+ char *value = NULL;
+ char *variable = NULL;
snprintf (timekey, 100, "%s%cTime", resource, VARIABLE_SEPARATOR);
snprintf (valuekey, 100, "%s%cValue", resource, VARIABLE_SEPARATOR);
snprintf (variablekey, 100, "%s%cVariable", resource, VARIABLE_SEPARATOR);
- char *time = xbt_dict_get_or_null (last_platform_variables, timekey);
+ time = xbt_dict_get_or_null (last_platform_variables, timekey);
if (!time) continue;
- char *value = xbt_dict_get (last_platform_variables, valuekey);
- char *variable = xbt_dict_get (last_platform_variables, variablekey);
+ value = xbt_dict_get (last_platform_variables, valuekey);
+ variable = xbt_dict_get (last_platform_variables, variablekey);
pajeSubVariable (atof(time), variable, resource, value);
- //TODO: should remove, but it is causing sigabort
- //xbt_dict_remove (last_platform_variables, timekey);
- //xbt_dict_remove (last_platform_variables, valuekey);
- //xbt_dict_remove (last_platform_variables, variablekey);
+ xbt_dict_remove (last_platform_variables, timekey);
+ xbt_dict_remove (last_platform_variables, valuekey);
+ xbt_dict_remove (last_platform_variables, variablekey);
}
}
}
{
/* check if we have to set it to 0 */
if (!xbt_dict_get_or_null (platform_variables, resource)){
- xbt_dynar_t array = xbt_dynar_new(100*sizeof(char), xbt_free);
- xbt_dynar_push (array, xbt_strdup(variable));
+ xbt_dynar_t array = xbt_dynar_new(sizeof(char*), xbt_free);
+ char *var_cpy = xbt_strdup(variable);
+ xbt_dynar_push (array, &var_cpy);
if (IS_TRACING_PLATFORM) pajeSetVariable (now, variable, resource, "0");
xbt_dict_set (platform_variables, resource, array, xbt_dynar_free_voidp);
}else{
xbt_dynar_t array = xbt_dict_get (platform_variables, resource);
unsigned int i;
- char cat[100];
+ char* cat;
int flag = 0;
xbt_dynar_foreach (array, i, cat) {
if (strcmp(variable, cat)==0){
}
}
if (flag==0){
- xbt_dynar_push (array, strdup(variable));
+ char *var_cpy = xbt_strdup(variable);
+ xbt_dynar_push (array, &var_cpy);
if (IS_TRACING_PLATFORM) pajeSetVariable (now, variable, resource, "0");
}
}
void __TRACE_surf_update_action_state_resource (double now, double delta, const char *variable, const char *resource, double value)
{
+ char valuestr[100];
+ char nowstr[100], nowdeltastr[100];
+ char timekey[100], valuekey[100], variablekey[100];
+ char *lastvariable = NULL;
+ char *lasttime = NULL;
+ char *lastvalue = NULL;
+ char *nowdeltastr_cpy = NULL;
+ char *valuestr_cpy = NULL;
+ char *variable_cpy = NULL;
+
if (!IS_TRACING_PLATFORM) return;
- char valuestr[100];
snprintf (valuestr, 100, "%f", value);
/*
* variables. It should be re-checked before put in production.
*/
- char nowstr[100], nowdeltastr[100];
snprintf (nowstr, 100, "%.15f", now);
snprintf (nowdeltastr, 100, "%.15f", now+delta);
- char timekey[100], valuekey[100], variablekey[100];
snprintf (timekey, 100, "%s%cTime", resource, VARIABLE_SEPARATOR);
snprintf (valuekey, 100, "%s%cValue", resource, VARIABLE_SEPARATOR);
snprintf (variablekey, 100, "%s%cVariable", resource, VARIABLE_SEPARATOR);
- char *lastvariable = xbt_dict_get_or_null (last_platform_variables, variablekey);
+ lastvariable = xbt_dict_get_or_null (last_platform_variables, variablekey);
if (lastvariable == NULL){
__TRACE_surf_check_variable_set_to_zero (now, variable, resource);
pajeAddVariable (now, variable, resource, valuestr);
- xbt_dict_set (last_platform_variables, xbt_strdup (timekey), xbt_strdup (nowdeltastr), xbt_free);
- xbt_dict_set (last_platform_variables, xbt_strdup (valuekey), xbt_strdup (valuestr), xbt_free);
- xbt_dict_set (last_platform_variables, xbt_strdup (variablekey), xbt_strdup (variable), xbt_free);
+ nowdeltastr_cpy = xbt_strdup (nowdeltastr);
+ valuestr_cpy = xbt_strdup (valuestr);
+ variable_cpy = xbt_strdup (variable);
+ xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
+ xbt_dict_set (last_platform_variables, valuekey, valuestr_cpy, xbt_free);
+ xbt_dict_set (last_platform_variables, variablekey, variable_cpy, xbt_free);
}else{
- char *lasttime = xbt_dict_get_or_null (last_platform_variables, timekey);
- char *lastvalue = xbt_dict_get_or_null (last_platform_variables, valuekey);
+ lasttime = xbt_dict_get_or_null (last_platform_variables, timekey);
+ lastvalue = xbt_dict_get_or_null (last_platform_variables, valuekey);
/* check if it is the same variable */
if (strcmp(lastvariable, variable) == 0){ /* same variable */
if (atof(lasttime) == now){ /* lastime == now */
/* check if lastvalue equals valuestr */
if (atof(lastvalue) == value){ /* lastvalue == value (good, just advance time) */
- xbt_dict_set (last_platform_variables, xbt_strdup(timekey), xbt_strdup(nowdeltastr), xbt_free);
+ char *nowdeltastr_cpy = xbt_strdup (nowdeltastr);
+ xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
}else{ /* value has changed */
/* value has changed, subtract previous value, add new one */
pajeSubVariable (atof(lasttime), variable, resource, lastvalue);
pajeAddVariable (atof(nowstr), variable, resource, valuestr);
- xbt_dict_set (last_platform_variables, xbt_strdup(timekey), xbt_strdup(nowdeltastr), xbt_free);
- xbt_dict_set (last_platform_variables, xbt_strdup(valuekey), xbt_strdup(valuestr), xbt_free);
+ nowdeltastr_cpy = xbt_strdup (nowdeltastr);
+ valuestr_cpy = xbt_strdup (valuestr);
+ xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
+ xbt_dict_set (last_platform_variables, valuekey, valuestr_cpy, xbt_free);
}
}else{ /* lasttime != now */
/* the last time is different from new starting time, subtract to lasttime and add from nowstr */
pajeSubVariable (atof(lasttime), variable, resource, lastvalue);
pajeAddVariable (atof(nowstr), variable, resource, valuestr);
- xbt_dict_set (last_platform_variables, xbt_strdup(timekey), xbt_strdup(nowdeltastr), xbt_free);
- xbt_dict_set (last_platform_variables, xbt_strdup(valuekey), xbt_strdup(valuestr), xbt_free);
+ nowdeltastr_cpy = xbt_strdup (nowdeltastr);
+ valuestr_cpy = xbt_strdup (valuestr);
+ xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
+ xbt_dict_set (last_platform_variables, valuekey, valuestr_cpy, xbt_free);
}
}else{ /* variable has changed */
pajeSubVariable (atof(lasttime), lastvariable, resource, lastvalue);
__TRACE_surf_check_variable_set_to_zero (now, variable, resource);
pajeAddVariable (now, variable, resource, valuestr);
- xbt_dict_set (last_platform_variables, xbt_strdup (timekey), xbt_strdup (nowdeltastr), xbt_free);
- xbt_dict_set (last_platform_variables, xbt_strdup (valuekey), xbt_strdup (valuestr), xbt_free);
- xbt_dict_set (last_platform_variables, xbt_strdup (variablekey), xbt_strdup (variable), xbt_free);
+ nowdeltastr_cpy = xbt_strdup (nowdeltastr);
+ valuestr_cpy = xbt_strdup (valuestr);
+ variable_cpy = xbt_strdup (variable);
+ xbt_dict_set (last_platform_variables, timekey, nowdeltastr_cpy, xbt_free);
+ xbt_dict_set (last_platform_variables, valuekey, valuestr_cpy, xbt_free);
+ xbt_dict_set (last_platform_variables, variablekey, variable_cpy, xbt_free);
}
}
return;
void __TRACE_surf_set_resource_variable (double date, const char *variable, const char *resource, double value)
{
+ char aux[100], key[100];
+ char *last_value = NULL;
if (!IS_TRACING) return;
- char aux[100], key[100];
snprintf (aux, 100, "%f", value);
snprintf (key, 100, "%s%c%s", resource, VARIABLE_SEPARATOR, variable);
- char *last_value = xbt_dict_get_or_null(resource_variables, key);
+ last_value = xbt_dict_get_or_null(resource_variables, key);
if (last_value){
if (atof(last_value) == value){
return;
xbt_dict_set (resource_variables, xbt_strdup(key), xbt_strdup(aux), xbt_free);
}
-void TRACE_surf_update_action_state (void *surf_action, smx_action_t smx_action,
- double value, const char *stateValue, double now, double delta)
-{
-}
-
-void TRACE_surf_update_action_state_net_resource (const char *name, smx_action_t smx_action, double value, double now, double delta)
+void TRACE_surf_link_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta)
{
+ char type[100];
if (!IS_TRACING || !IS_TRACED(smx_action)) return;
if (strcmp (name, "__loopback__")==0 ||
if (value == 0) return;
if (!xbt_dict_get_or_null (created_links, name)){
- TRACE_surf_missing_link ();
+ TRACE_surf_link_missing ();
return;
}
- char type[100];
snprintf (type, 100, "b%s", smx_action->category);
__TRACE_surf_update_action_state_resource (now, delta, type, name, value);
return;
}
-void TRACE_surf_update_action_state_cpu_resource (const char *name, smx_action_t smx_action, double value, double now, double delta)
+void TRACE_surf_host_set_utilization (const char *name, smx_action_t smx_action, double value, double now, double delta)
{
+ char type[100];
if (!IS_TRACING || !IS_TRACED(smx_action)) return;
if (value==0){
return;
}
- char type[100];
snprintf (type, 100, "p%s", smx_action->category);
__TRACE_surf_update_action_state_resource (now, delta, type, name, value);
return;
}
-void TRACE_surf_net_link_new (char *name, double bw, double lat)
+/*
+ * TRACE_surf_link_declaration (name, bandwidth, latency): this function
+ * saves the bandwidth and latency of a link identified by name. This
+ * information is used in the future to create the link container in the trace.
+ *
+ * caller: net_link_new (from each network model)
+ * main: save bandwidth and latency information
+ * return: void
+ */
+void TRACE_surf_link_declaration (char *name, double bw, double lat)
{
if (!IS_TRACING) return;
- //if (IS_TRACING_PLATFORM) pajeCreateContainerWithBandwidthLatency (SIMIX_get_clock(), name, "LINK", "platform", name, bw, lat);
- //save bw and lat information for this link
- double *bw_ptr, *lat_ptr;
- bw_ptr = xbt_new (double, 1);
- lat_ptr = xbt_new (double, 1);
+
+ double *bw_ptr = xbt_malloc(sizeof(double));
+ double *lat_ptr = xbt_malloc(sizeof(double));
*bw_ptr = bw;
*lat_ptr = lat;
- xbt_dict_set (link_bandwidth, xbt_strdup(name), bw_ptr, xbt_free);
- xbt_dict_set (link_latency, xbt_strdup(name), lat_ptr, xbt_free);
+ xbt_dict_set (link_bandwidth, name, bw_ptr, xbt_free);
+ xbt_dict_set (link_latency, name, lat_ptr, xbt_free);
}
-void TRACE_surf_cpu_new (char *name, double power)
+/*
+ * TRACE_surf_host_declaration (name, power): this function
+ * saves the power of a host identified by name. This information
+ * is used to create the host container in the trace.
+ *
+ * caller: cpu_new (from each cpu model) + router parser
+ * main: create HOST containers, set initial power value
+ * return: void
+ */
+void TRACE_surf_host_declaration (char *name, double power)
{
if (!IS_TRACING) return;
+ pajeCreateContainer (SIMIX_get_clock(), name, "HOST", "platform", name);
+ xbt_dict_set (host_containers, name, xbt_strdup("1"), xbt_free);
if (IS_TRACING_PLATFORM){
- pajeCreateContainer (SIMIX_get_clock(), name, "HOST", "platform", name);
- xbt_dict_set (host_containers, xbt_strdup(name), xbt_strdup("1"), xbt_free);
+ __TRACE_surf_set_resource_variable (SIMIX_get_clock(), "power", name, power);
}
- __TRACE_surf_set_resource_variable (SIMIX_get_clock(), "power", name, power);
}
-void TRACE_surf_routing_full_parse_end (char *link_name, int src, int dst)
+/*
+ * TRACE_surf_link_save_endpoints (link_name, src, dst): this function
+ * creates the container of a link identified by link_name. It gets
+ * bandwidth and latency information from the dictionaries previously
+ * filled. The end points are obtained from the hosts_id dictionary.
+ *
+ * caller: end of parsing
+ * main: create LINK containers, set initial bandwidth and latency values
+ * return: void
+ */
+void TRACE_surf_link_save_endpoints (char *link_name, int src, int dst)
{
+ char srcidstr[100], dstidstr[100];
+ char key[100];
+
if (!IS_TRACING) return;
- char srcidstr[100], dstidstr[100];
snprintf (srcidstr, 100, "%d", src);
snprintf (dstidstr, 100, "%d", dst);
char *srcname = xbt_dict_get (hosts_id, srcidstr);
char *dstname = xbt_dict_get (hosts_id, dstidstr);
-
- char key[100];
snprintf (key, 100, "l%d-%d", src, dst);
if (strcmp (link_name, "__loopback__")==0 ||
}
if (!xbt_dict_get_or_null (created_links, link_name)){
- //if (IS_TRACING_PLATFORM) pajeStartLink (SIMIX_get_clock(), "edge", "platform", "route", srcname, key);
- //if (IS_TRACING_PLATFORM) pajeEndLink (SIMIX_get_clock()+0.1, "edge", "platform", "route", dstname, key);
- double *bw = xbt_dict_get (link_bandwidth, link_name);
- double *lat = xbt_dict_get (link_latency, link_name);
- if (IS_TRACING_PLATFORM) pajeCreateContainerWithBandwidthLatencySrcDst (SIMIX_get_clock(), link_name, "LINK", "platform", link_name, *bw, *lat, srcname, dstname);
- __TRACE_surf_set_resource_variable (SIMIX_get_clock(), "bandwidth", link_name, *bw);
- __TRACE_surf_set_resource_variable (SIMIX_get_clock(), "latency", link_name, *lat);
- xbt_dict_set (created_links, xbt_strdup(link_name), xbt_strdup ("1"), xbt_free);
+ char *bw = xbt_dict_get (link_bandwidth, link_name);
+ char *lat = xbt_dict_get (link_latency, link_name);
+ pajeCreateContainerWithBandwidthLatencySrcDst (SIMIX_get_clock(), link_name, "LINK", "platform", link_name, *bw, *lat, srcname, dstname);
+ if (IS_TRACING_PLATFORM) __TRACE_surf_set_resource_variable (SIMIX_get_clock(), "bandwidth", link_name, *bw);
+ if (IS_TRACING_PLATFORM) __TRACE_surf_set_resource_variable (SIMIX_get_clock(), "latency", link_name, *lat);
+ xbt_dict_set (created_links, link_name, xbt_strdup ("1"), xbt_free);
}
}
-void TRACE_surf_cpu_set_power (double date, char *resource, double power)
+/*
+ * TRACE_surf_host_define_id (name, host_id): This function relates
+ * the name of the host with its id, as generated by the called and
+ * passed as second parameter.
+ *
+ * caller: host parser, router parser
+ * main: save host_id
+ * return: void
+ */
+void TRACE_surf_host_define_id (const char *name, int host_id)
+{
+ char strid[100];
+ if (!IS_TRACING) return;
+ snprintf (strid, 100, "%d", host_id);
+ xbt_dict_set (hosts_id, name, strdup(strid), free);
+ xbt_dict_set (hosts_id, strid, strdup(name), free);
+}
+
+void TRACE_surf_host_set_power (double date, char *resource, double power)
{
__TRACE_surf_set_resource_variable (date, "power", resource, power);
}
__TRACE_surf_set_resource_variable (date, "latency", resource, latency);
}
-void TRACE_surf_define_host_id (const char *name, int host_id)
-{
- if (!IS_TRACING) return;
- char strid[100];
- snprintf (strid, 100, "%d", host_id);
- xbt_dict_set (hosts_id, strdup(name), strdup(strid), free);
- xbt_dict_set (hosts_id, strdup(strid), strdup(name), free);
-}
-
/* to trace gtnets */
void TRACE_surf_gtnets_communicate (void *action, int src, int dst)
{
+ char key[100], aux[100];
if (!IS_TRACING) return;
- char key[100], aux[100];
snprintf (key, 100, "%p", action);
snprintf (aux, 100, "%d", src);
- xbt_dict_set (gtnets_src, xbt_strdup(key), xbt_strdup(aux), xbt_free);
+ xbt_dict_set (gtnets_src, key, xbt_strdup(aux), xbt_free);
snprintf (aux, 100, "%d", dst);
- xbt_dict_set (gtnets_dst, xbt_strdup(key), xbt_strdup(aux), xbt_free);
+ 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 (!IS_TRACING) return -1;
- char key[100];
snprintf (key, 100, "%p", action);
- char *aux = xbt_dict_get_or_null (gtnets_src, key);
+ aux = xbt_dict_get_or_null (gtnets_src, key);
if (aux){
return atoi(aux);
}else{
int TRACE_surf_gtnets_get_dst (void *action)
{
+ char key[100];
+ char *aux = NULL;
if (!IS_TRACING) return -1;
- char key[100];
snprintf (key, 100, "%p", action);
- char *aux = xbt_dict_get_or_null (gtnets_dst, key);
+ aux = xbt_dict_get_or_null (gtnets_dst, key);
if (aux){
return atoi(aux);
}else{
void TRACE_surf_gtnets_destroy (void *action)
{
- if (!IS_TRACING) return;
char key[100];
+ if (!IS_TRACING) return;
snprintf (key, 100, "%p", action);
xbt_dict_remove (gtnets_src, key);
xbt_dict_remove (gtnets_dst, key);
}
-void TRACE_surf_missing_link (void)
+void TRACE_surf_link_missing (void)
{
CRITICAL0("The trace cannot be done because "
"the platform you are using contains "
void TRACE_msg_clean (void)
{
- __TRACE_surf_finalize();
-
- xbt_dict_cursor_t cursor = NULL;
- unsigned int cursor_ar = 0;
char *key, *value;
+ xbt_dict_cursor_t cursor = NULL;
+ __TRACE_surf_finalize();
/* get all host from host_containers */
xbt_dict_foreach(host_containers, cursor, key, value) {
- if (IS_TRACING_PLATFORM) pajeDestroyContainer (MSG_get_clock(), "HOST", key);
+ pajeDestroyContainer (MSG_get_clock(), "HOST", key);
}
}
+void TRACE_surf_host_vivaldi_parse (char *host, double x, double y, double h)
+{
+ char valuestr[100];
+ if (!IS_TRACING || !IS_TRACING_PLATFORM) 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);
+}
+
#endif