static char *gw_src = NULL; /* temporary store the gateway source name of a route */
static char *gw_dst = NULL; /* temporary store the gateway destination name of a route */
static double_f_cpvoid_t get_link_latency = NULL;
-xbt_dict_t cluster_host_link = NULL; /* for tag cluster */
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
-static void routing_parse_Speer(void); /* peer bypass */
+static void routing_parse_Speer(sg_platf_peer_cbarg_t peer); /* peer bypass */
static void routing_parse_Srandom(void); /* random bypass */
static char* replace_random_parameter(char * chaine);
{"Vivaldi", "Vivaldi routing", model_vivaldi_create,
model_none_load, model_none_unload, model_none_end},
{"Cluster", "Cluster routing", model_cluster_create,
- model_none_load, model_none_unload, model_none_end},
+ model_none_load, model_cluster_unload, model_none_end},
{NULL, NULL, NULL, NULL, NULL, NULL}
};
}
}
-/**
- * brief Add a "router" to the network element list from XML description
- */
-static void parse_S_router_lua(const char* router_id) {
- s_sg_platf_router_cbarg_t router;
- memset(&router,0,sizeof(router));
- router.id = router_id;
- router.coord = "";
- return parse_S_router(&router);
-}
-
/**
* \brief Set the endponints for a route
*/
A_surfxml_route_dst);
}
-/**
- * \brief Set the endpoints for a route from lua
- */
-static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst)
-{
- parse_S_route_new_and_endpoints(id_src, id_dst);
-}
-
/**
* \brief Set the endponints and gateways for a ASroute
*/
}
}
-/**
- * \brief Set a new link on the actual list of link for a route or ASroute from lua
- */
-static void parse_E_link_c_ctn_new_elem_lua(const char *link_id)
-{
- parse_E_link_ctn_new_elem(link_id);
-}
-
/**
* \brief Store the route by calling the set_route function of the current routing component
*/
* Once this function was called, the configuration concerning the used
* models cannot be changed anymore.
*
- * @param AS_id name of this autonomous system. Must be uniq in the platform
+ * @param AS_id name of this autonomous system. Must be unique in the platform
* @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c
*/
-void sg_platf_new_AS_open(const char *AS_id, const char *wanted_routing_type)
+void routing_AS_open(const char *AS_id, const char *wanted_routing_type)
{
routing_component_t new_routing;
model_type_t model = NULL;
* even if you add stuff to a closed AS
*
*/
-void sg_platf_new_AS_close() {
+void routing_AS_close() {
if (current_routing == NULL) {
THROWF(arg_error, 0, "Close an AS, but none was under construction");
*/
static void finalize(void)
{
- /* delete recursibly all the tree */
+ /* delete recursively all the tree */
_finalize(global_routing->root);
/* delete last_route */
xbt_dynar_free(&(global_routing->last_route));
surfxml_add_callback(STag_surfxml_cluster_cb_list,
&routing_parse_Scluster);
- surfxml_add_callback(STag_surfxml_peer_cb_list,
- &routing_parse_Speer);
-
+ sg_platf_peer_add_cb(routing_parse_Speer); // FIXME: inline in the sg_platf_new_peer instead
sg_platf_postparse_add_cb(clean_routing_after_parse);
#ifdef HAVE_TRACING
void routing_parse_Scluster(void)
{
- if(!cluster_host_link)
- cluster_host_link = xbt_dict_new();
-
static int AX_ptr = 0;
char *host_id, *groups, *link_id = NULL;
XBT_DEBUG("</host>");
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
- if(struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
- {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
- if(struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
- {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
-
XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->bw, struct_cluster->lat);
memset(&link,0,sizeof(link));
link.latency = struct_cluster->lat;
link.state = SURF_RESOURCE_ON;
- switch (A_surfxml_link_sharing_policy) {
- case A_surfxml_link_sharing_policy_SHARED:
- link.policy = SURF_LINK_SHARED;
- break;
- case A_surfxml_link_sharing_policy_FATPIPE:
+ switch (struct_cluster->sharing_policy) {
+ case A_surfxml_cluster_sharing_policy_FATPIPE:
link.policy = SURF_LINK_FATPIPE;
break;
- case A_surfxml_link_sharing_policy_FULLDUPLEX:
+ case A_surfxml_cluster_sharing_policy_FULLDUPLEX:
link.policy = SURF_LINK_FULLDUPLEX;
break;
- case AU_surfxml_link_sharing_policy:
- surf_parse_error(bprintf("Invalid sharing policy in cluster %s (please report this bug, this shouldn't happen)",struct_cluster->id));
+ default:
+ link.policy = SURF_LINK_SHARED;
}
sg_platf_new_link(&link);
surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
- if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){
+ if (struct_cluster->sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX){
char* tmp_link = bprintf("%s_UP",link_id);
info->link_up = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
free(tmp_link);
info->link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
info->link_down = info->link_up;
}
- xbt_dict_set(cluster_host_link,host_id,info,xbt_free);
+ surf_routing_cluster_add_link(host_id,info);
xbt_free(link_id);
xbt_free(host_id);
info->link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL);
info->link_down = info->link_up;
}
- xbt_dict_set(cluster_host_link,host_id,info,xbt_free);
+ surf_routing_cluster_add_link(host_id,info);
+
xbt_free(link_id);
xbt_free(host_id);
surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
info->link_up = xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL);
info->link_down = info->link_up;
- xbt_dict_set(cluster_host_link,struct_cluster->id,info,xbt_free);
+ surf_routing_cluster_add_link(struct_cluster->id, info);
+
free(link_backbone);
}
xbt_dict_free(&patterns);
}
-static void routing_parse_Speer(void)
+static void routing_parse_Speer(sg_platf_peer_cbarg_t peer)
{
static int AX_ptr = 0;
char *host_id = NULL;
surfxml_bufferstack_push(1);
- XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", struct_peer->id);
- sg_platf_new_AS_open(struct_peer->id, "Full");
+ XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", peer->id);
+ sg_platf_new_AS_open(peer->id, "Full");
XBT_DEBUG(" ");
- host_id = HOST_PEER(struct_peer->id);
- router_id = ROUTER_PEER(struct_peer->id);
- link_id_up = LINK_UP_PEER(struct_peer->id);
- link_id_down = LINK_DOWN_PEER(struct_peer->id);
+ host_id = HOST_PEER(peer->id);
+ router_id = ROUTER_PEER(peer->id);
+ link_id_up = LINK_UP_PEER(peer->id);
+ link_id_down = LINK_DOWN_PEER(peer->id);
- link_router = bprintf("%s_link_router", struct_peer->id);
- link_backbone = bprintf("%s_backbone", struct_peer->id);
+ link_router = bprintf("%s_link_router", peer->id);
+ link_backbone = bprintf("%s_backbone", peer->id);
- XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, struct_peer->power);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%f\"/>", host_id, peer->power);
s_sg_platf_host_cbarg_t host;
memset(&host,0,sizeof(host));
host.initial_state = SURF_RESOURCE_ON;
host.id = host_id;
- host.power_peak = surf_parse_get_double(struct_peer->power);
+ host.power_peak = peer->power;
host.power_scale = 1.0;
- host.power_trace = tmgr_trace_new(struct_peer->availability_trace);
- host.state_trace = tmgr_trace_new(struct_peer->state_trace);
+ host.power_trace = peer->availability_trace;
+ host.state_trace = peer->state_trace;
host.core_amount = 1;
sg_platf_new_host(&host);
- XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, struct_peer->coord);
+ XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, peer->coord);
s_sg_platf_router_cbarg_t router;
memset(&router,0,sizeof(router));
router.id = router_id;
- router.coord = struct_peer->coord;
+ router.coord = peer->coord;
sg_platf_new_router(&router);
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, struct_peer->bw_in, struct_peer->lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id_up, peer->bw_in, peer->lat);
s_sg_platf_link_cbarg_t link;
memset(&link,0,sizeof(link));
link.state = SURF_RESOURCE_ON;
link.policy = SURF_LINK_SHARED;
link.id = link_id_up;
- link.bandwidth = surf_parse_get_double(struct_peer->bw_in);
- link.latency = surf_parse_get_double(struct_peer->lat);
+ link.bandwidth = peer->bw_in;
+ link.latency = peer->lat;
sg_platf_new_link(&link);
- XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, struct_peer->bw_out, struct_peer->lat);
+ // FIXME: dealing with full duplex is not the role of this piece of code, I'd say [Mt]
+ // Instead, it should be created fullduplex, and the models will do what's needed in this case
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id_down, peer->bw_out, peer->lat);
link.id = link_id_down;
sg_platf_new_link(&link);
xbt_dynar_free(&radical_elements);
}
}
-