X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2c7a1ae78246fa7808b1cd2385d27985bbb331f..dec88cb5450df90eb490d9bf0655184904981438:/src/surf/surf_routing_private.h diff --git a/src/surf/surf_routing_private.h b/src/surf/surf_routing_private.h index e11316ecac..b63fb23a9c 100644 --- a/src/surf/surf_routing_private.h +++ b/src/surf/surf_routing_private.h @@ -8,7 +8,7 @@ #define _SURF_SURF_ROUTING_PRIVATE_H #include -#include "gras_config.h" +#include "internal_config.h" #include "surf_private.h" #include "xbt/dynar.h" @@ -29,46 +29,39 @@ void model_none_finalize(AS_t as); AS_t model_generic_create_sized(size_t childsize); void model_generic_finalize(AS_t as); -void generic_parse_PU(AS_t rc, const char *name); -void generic_parse_AS(AS_t rc, const char *name); -void generic_parse_bypassroute(AS_t rc, const char *src, const char *dst, - route_extended_t e_route); +int generic_parse_PU(AS_t rc, sg_routing_edge_t elm); +int generic_parse_AS(AS_t rc, sg_routing_edge_t elm); +void generic_parse_bypassroute(AS_t rc, sg_platf_route_cbarg_t e_route); /* ************************************************************************** */ /* *************** GENERIC BUSINESS METHODS (declarations) ****************** */ -double generic_get_link_latency(AS_t rc, const char *src, const char *dst, - route_extended_t e_route); xbt_dynar_t generic_get_onelink_routes(AS_t rc); -route_extended_t generic_get_bypassroute(AS_t rc, - const char *src, - const char *dst); +sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc, + sg_routing_edge_t src, + sg_routing_edge_t dst, + double *lat); /* ************************************************************************** */ /* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */ -route_extended_t -generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, - void *data, int order); -route_t -generic_new_route(e_surf_routing_hierarchy_t hierarchy, - void *data, int order); -void generic_free_route(route_t route); -void generic_free_extended_route(route_extended_t e_route); +/* change a route containing link names into a route containing link entities. + * If change_order is true, the links are put in reverse order in the + * produced route */ +sg_platf_route_cbarg_t generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, + sg_platf_route_cbarg_t data, int preserve_order); AS_t generic_autonomous_system_exist(AS_t rc, char *element); AS_t generic_processing_units_exist(AS_t rc, char *element); -void generic_src_dst_check(AS_t rc, const char *src, - const char *dst); - +void generic_src_dst_check(AS_t rc, sg_routing_edge_t src, + sg_routing_edge_t dst); /* ************************************************************************** */ /* *************************** FLOYD ROUTING ******************************** */ AS_t model_floyd_create(void); /* create structures for floyd routing model */ void model_floyd_end(AS_t as); /* finalize the creation of floyd routing model */ -void model_floyd_parse_route(AS_t rc, const char *src, - const char *dst, route_extended_t route); +void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route); /* ************************************************** */ /* ************** RULE-BASED ROUTING **************** */ @@ -76,17 +69,21 @@ AS_t model_rulebased_create(void); /* create structures for rulebased routi /* ************************************************** */ /* ************** Cluster ROUTING **************** */ -AS_t model_cluster_create(void); /* create structures for cluster routing model */ +typedef struct { + s_as_t generic_routing; + void *backbone; + void *loopback; + sg_routing_edge_t router; +} s_as_cluster_t, *as_cluster_t; -void surf_routing_cluster_add_link(const char* host_id,surf_parsing_link_up_down_t info); +AS_t model_cluster_create(void); /* create structures for cluster routing model */ /* ************************************************** */ /* ************** Vivaldi ROUTING **************** */ 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_UP_PEER(peername) bprintf("link_%s_up", peername) -#define LINK_DOWN_PEER(peername) bprintf("link_%s_down", peername) +#define LINK_PEER(peername) bprintf("link_%s", peername) /* ************************************************************************** */ /* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */ @@ -94,15 +91,18 @@ AS_t model_dijkstra_both_create(int cached); /* create by calling dijkstra or AS_t model_dijkstra_create(void); /* create structures for dijkstra routing model */ AS_t model_dijkstracache_create(void); /* create structures for dijkstracache routing model */ void model_dijkstra_both_end(AS_t as); /* finalize the creation of dijkstra routing model */ -void model_dijkstra_both_parse_route (AS_t rc, const char *src, - const char *dst, route_extended_t route); +void model_dijkstra_both_parse_route (AS_t rc, sg_platf_route_cbarg_t route); /* ************************************************************************** */ /* *************************** FULL ROUTING ********************************* */ AS_t model_full_create(void); /* create structures for full routing model */ void model_full_end(AS_t as); /* finalize the creation of full routing model */ -void model_full_set_route( /* Set the route and ASroute between src and dst */ - AS_t rc, const char *src, const char *dst, route_extended_t route); +void model_full_set_route( /* Set the route and ASroute between src and dst */ + AS_t rc, sg_platf_route_cbarg_t route); +/* ************************************************************************** */ +/* ************************* GRAPH EXPORTING FUNCTIONS ********************** */ +xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes); +xbt_edge_t new_xbt_graph_edge (xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges); #endif /* _SURF_SURF_ROUTING_PRIVATE_H */