#define VARIABLE_SEPARATOR '#'
-static xbt_dict_t hosts_id;
+static xbt_dict_t host_router_id; //name(char*) -> id(char*)
+static xbt_dict_t host_router_name; //id(char*) -> name (char*)
+
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 last_platform_variables; /* to control the amount of add/sub variables events:
void __TRACE_surf_init (void)
{
- hosts_id = xbt_dict_new();
+ host_router_id = xbt_dict_new();
+ host_router_name = xbt_dict_new();
created_links = xbt_dict_new();
link_bandwidth = xbt_dict_new();
link_latency = xbt_dict_new();
return;
}
+/*
+ * 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)
{
- double *bw_ptr, *lat_ptr;
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
- 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, name, bw_ptr, xbt_free);
xbt_dict_set (link_latency, name, lat_ptr, xbt_free);
}
+/*
+ * 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;
}
}
+/*
+ * 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 host_router_name 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];
- char *srcname = NULL;
- char *dstname = NULL;
- double *bw = 0;
- double *lat = 0;
+
if (!IS_TRACING) return;
snprintf (srcidstr, 100, "%d", src);
snprintf (dstidstr, 100, "%d", dst);
- srcname = xbt_dict_get (hosts_id, srcidstr);
- dstname = xbt_dict_get (hosts_id, dstidstr);
+ char *srcname = xbt_dict_get (host_router_name, srcidstr);
+ char *dstname = xbt_dict_get (host_router_name, dstidstr);
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);
- bw = xbt_dict_get (link_bandwidth, link_name);
- lat = xbt_dict_get (link_latency, link_name);
+ double *bw = xbt_dict_get (link_bandwidth, link_name);
+ double *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);
}
}
+/*
+ * 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)
+{
+ if (!IS_TRACING) return;
+ char strid[100];
+ snprintf (strid, 100, "%d", host_id);
+ xbt_dict_set (host_router_id, name, xbt_strdup(strid), xbt_free);
+ xbt_dict_set (host_router_name, strid, xbt_strdup(name), xbt_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_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);
-}
-
/* to trace gtnets */
void TRACE_surf_gtnets_communicate (void *action, int src, int dst)
{
