X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3671bfe99e3f5f4dc48d8229eb57f965a1cf6913..f01580e0ccb84c36906cb6be929b5c9b784c1cc1:/src/surf/surf_routing_private.hpp diff --git a/src/surf/surf_routing_private.hpp b/src/surf/surf_routing_private.hpp index 36c6f731b8..5904dc9fc5 100644 --- a/src/surf/surf_routing_private.hpp +++ b/src/surf/surf_routing_private.hpp @@ -50,42 +50,21 @@ XBT_PRIVATE sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc, * produced route */ XBT_PRIVATE sg_platf_route_cbarg_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, sg_platf_route_cbarg_t data, int preserve_order); -XBT_PRIVATE AS_t -generic_autonomous_system_exist(AS_t rc, char *element); -XBT_PRIVATE AS_t -generic_processing_units_exist(AS_t rc, char *element); -void generic_src_dst_check(AS_t rc, sg_netcard_t src, - sg_netcard_t dst); +XBT_PRIVATE AS_t generic_autonomous_system_exist(AS_t rc, char *element); +XBT_PRIVATE AS_t generic_processing_units_exist(AS_t rc, char *element); +void generic_src_dst_check(AS_t rc, sg_netcard_t src, sg_netcard_t dst); /* ************************************************************************** */ /* *************************** FLOYD ROUTING ******************************** */ -XBT_PRIVATE AS_t model_floyd_create(void); /* create structures for floyd routing model */ XBT_PRIVATE void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route); -/* ************************************************** */ -/* ************** Cluster ROUTING **************** */ - -XBT_PRIVATE surf_As *model_cluster_create(void); /* create structures for cluster routing model */ -XBT_PRIVATE surf_As *model_torus_cluster_create(void); -XBT_PRIVATE surf_As *model_fat_tree_cluster_create(void); - -/* ************************************************** */ -/* ************** Vivaldi ROUTING **************** */ -XBT_PRIVATE AS_t model_vivaldi_create(void); /* create structures for vivaldi routing model */ #define HOST_PEER(peername) bprintf("peer_%s", peername) #define ROUTER_PEER(peername) bprintf("router_%s", peername) #define LINK_PEER(peername) bprintf("link_%s", peername) /* ************************************************************************** */ /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */ -XBT_PRIVATE AS_t model_dijkstra_both_create(int cached); /* create by calling dijkstra or dijkstracache */ -XBT_PRIVATE AS_t model_dijkstra_create(void); /* create structures for dijkstra routing model */ -XBT_PRIVATE AS_t model_dijkstracache_create(void); /* create structures for dijkstracache routing model */ XBT_PRIVATE void model_dijkstra_both_parse_route (AS_t rc, sg_platf_route_cbarg_t route); - -/* ************************************************************************** */ -/* *************************** FULL ROUTING ********************************* */ -XBT_PRIVATE AS_t model_full_create(void); /* create structures for full routing model */ XBT_PRIVATE void model_full_set_route( /* Set the route and ASroute between src and dst */ AS_t rc, sg_platf_route_cbarg_t route); /* ************************************************************************** */