#include "xbt/str.h"
#include "xbt/config.h"
#include "xbt/graph.h"
-#include "xbt/set.h"
-#include "surf/surfxml_parse.h"
/* ************************************************************************** */
/* ******************************* NO ROUTING ******************************* */
XBT_PRIVATE AS_t model_generic_create_sized(size_t childsize);
XBT_PRIVATE void model_generic_finalize(AS_t as);
-XBT_PRIVATE int generic_parse_PU(AS_t rc, sg_routing_edge_t elm);
-XBT_PRIVATE int generic_parse_AS(AS_t rc, sg_routing_edge_t elm);
-XBT_PRIVATE void generic_parse_bypassroute(AS_t rc, sg_platf_route_cbarg_t e_route);
+XBT_PRIVATE int generic_parse_PU(AS_t rc, sg_netcard_t elm);
+XBT_PRIVATE int generic_parse_AS(AS_t rc, sg_netcard_t elm);
/* ************************************************************************** */
/* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
XBT_PRIVATE xbt_dynar_t generic_get_onelink_routes(AS_t rc);
-XBT_PRIVATE 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) ****************** */
/* 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 */
-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_routing_edge_t src,
- sg_routing_edge_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_end(AS_t as); /* finalize the creation of floyd routing model */
-XBT_PRIVATE void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route);
+//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_end(AS_t as); /* finalize the creation of dijkstra 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_end(AS_t as); /* finalize the creation of 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);
/* ************************************************************************** */
/* ************************* GRAPH EXPORTING FUNCTIONS ********************** */
XBT_PRIVATE xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes);