}
-static void instr_routing_parse_start_router (sg_platf_router_cbarg_t router)
+void sg_instr_new_router(sg_platf_router_cbarg_t router)
{
container_t father = *(container_t*)xbt_dynar_get_ptr(currentContainer, xbt_dynar_length(currentContainer)-1);
PJ_container_new (router->id, INSTR_ROUTER, father);
if (!TRACE_needs_platform()) return;
sg_platf_link_add_cb(instr_routing_parse_start_link);
sg_platf_host_add_cb(instr_routing_parse_start_host);
- sg_platf_router_add_cb(instr_routing_parse_start_router);
sg_platf_postparse_add_cb(instr_routing_parse_end_platform);
}
xbt_dynar_t sg_platf_host_cb_list = NULL; // of sg_platf_host_cb_t
xbt_dynar_t sg_platf_host_link_cb_list = NULL; // of sg_platf_host_link_cb_t
xbt_dynar_t sg_platf_link_cb_list = NULL; // of sg_platf_link_cb_t
-xbt_dynar_t sg_platf_router_cb_list = NULL; // of sg_platf_router_cb_t
xbt_dynar_t sg_platf_peer_cb_list = NULL; // of sg_platf_peer_cb_t
xbt_dynar_t sg_platf_cluster_cb_list = NULL; // of sg_platf_cluster_cb_t
xbt_dynar_t sg_platf_cabinet_cb_list = NULL; // of sg_platf_cluster_cb_t
sg_platf_host_cb_list = xbt_dynar_new(sizeof(sg_platf_host_cb_t), NULL);
sg_platf_host_link_cb_list = xbt_dynar_new(sizeof(sg_platf_host_link_cb_t), NULL);
- sg_platf_router_cb_list = xbt_dynar_new(sizeof(sg_platf_router_cb_t), NULL);
sg_platf_link_cb_list = xbt_dynar_new(sizeof(sg_platf_link_cb_t), NULL);
sg_platf_peer_cb_list = xbt_dynar_new(sizeof(sg_platf_peer_cb_t), NULL);
sg_platf_cluster_cb_list = xbt_dynar_new(sizeof(sg_platf_cluster_cb_t), NULL);
void sg_platf_exit(void) {
xbt_dynar_free(&sg_platf_host_cb_list);
xbt_dynar_free(&sg_platf_host_link_cb_list);
- xbt_dynar_free(&sg_platf_router_cb_list);
xbt_dynar_free(&sg_platf_link_cb_list);
xbt_dynar_free(&sg_platf_postparse_cb_list);
xbt_dynar_free(&sg_platf_peer_cb_list);
XBT_DEBUG("Having set router coordinates for '%s'",router->id);
}
- unsigned int iterator;
- sg_platf_router_cb_t fun;
- xbt_dynar_foreach(sg_platf_router_cb_list, iterator, fun) {
- fun(router);
- }
+ if (TRACE_is_enabled())
+ sg_instr_new_router(router);
}
void sg_platf_new_link(sg_platf_link_cbarg_t link){
void sg_platf_link_add_cb(sg_platf_link_cb_t fct) {
xbt_dynar_push(sg_platf_link_cb_list, &fct);
}
-void sg_platf_router_add_cb(sg_platf_router_cb_t fct) {
- xbt_dynar_push(sg_platf_router_cb_list, &fct);
-}
void sg_platf_peer_add_cb(sg_platf_peer_cb_t fct) {
xbt_dynar_push(sg_platf_peer_cb_list, &fct);
}