static int link_count = -1;
network_link_GTNETS_t gtnets_link;
- if (xbt_dict_get_or_null(surf_network_model->resource_set, name)) {
+ if (xbt_lib_get_or_null(link_lib, name, SURF_LINK_LEVEL)) {
return;
}
}
gtnets_link->id = link_count;
- xbt_dict_set(surf_network_model->resource_set, name, gtnets_link,
- surf_resource_free);
+ xbt_lib_set(link_lib, name, SURF_LINK_LEVEL, gtnets_link);
}
static void route_new(int src_id, int dst_id, xbt_dynar_t links,
if (state_trace)
XBT_INFO("The GTNetS network model doesn't support link state traces");
- current_property_set = xbt_dict_new();
if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
{
link_new(bprintf("%s_UP",name), bw, lat, current_property_set);
}
else link_new(name, bw, lat, current_property_set);
+ current_property_set = NULL;
}
/* Create the gtnets topology based on routing strategy */
static void define_callbacks(const char *file)
{
/* Figuring out the network links */
- surfxml_add_callback(STag_surfxml_link_cb_list, &parse_link_init);
+ surfxml_add_callback(ETag_surfxml_link_cb_list, &parse_link_init);
surfxml_add_callback(ETag_surfxml_platform_cb_list,
&create_gtnets_topology);
}
/* Add a flow to the GTNets Simulation, associated to this action */
if (gtnets_create_flow(src, dst, size, (void *) action) < 0) {
- xbt_die(bprintf("Not route between host %s and host %s", src_name,
- dst_name));
+ xbt_die("Not route between host %s and host %s", src_name, dst_name);
}
#ifdef HAVE_TRACING
TRACE_surf_gtnets_communicate(action, src, dst);