X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/49e85177c669d793e84242983a1b1f430e47184e..f4af50b182ee0b683c2928eae98e31dbe7fd0f3e:/src/surf/surf_routing_private.hpp diff --git a/src/surf/surf_routing_private.hpp b/src/surf/surf_routing_private.hpp index fa365c1518..4f16393947 100644 --- a/src/surf/surf_routing_private.hpp +++ b/src/surf/surf_routing_private.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2011, 2013-2014. The SimGrid Team. +/* Copyright (c) 2009-2011, 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,39 +8,33 @@ #define _SURF_SURF_ROUTING_PRIVATE_H #include -#include "internal_config.h" +#include "src/internal_config.h" #include "surf_interface.hpp" +#include "xbt/base.h" #include "xbt/dynar.h" #include "xbt/str.h" #include "xbt/config.h" #include "xbt/graph.h" -#include "xbt/set.h" -#include "surf/surfxml_parse.h" /* ************************************************************************** */ /* ******************************* NO ROUTING ******************************* */ /* Only save the AS tree, and forward calls to child ASes */ -AS_t model_none_create(void); -AS_t model_none_create_sized(size_t childsize); -void model_none_finalize(AS_t as); +XBT_PRIVATE AS_t model_none_create(void); +XBT_PRIVATE AS_t model_none_create_sized(size_t childsize); +XBT_PRIVATE void model_none_finalize(AS_t as); /* ************************************************************************** */ /* ***************** GENERIC PARSE FUNCTIONS (declarations) ***************** */ -AS_t model_generic_create_sized(size_t childsize); -void model_generic_finalize(AS_t as); +XBT_PRIVATE AS_t model_generic_create_sized(size_t childsize); +XBT_PRIVATE void model_generic_finalize(AS_t as); -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); +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_dynar_t generic_get_onelink_routes(AS_t rc); -sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc, - sg_routing_edge_t src, - sg_routing_edge_t dst, - double *lat); +XBT_PRIVATE xbt_dynar_t generic_get_onelink_routes(AS_t rc); /* ************************************************************************** */ /* ****************** GENERIC AUX FUNCTIONS (declarations) ****************** */ @@ -48,53 +42,22 @@ sg_platf_route_cbarg_t generic_get_bypassroute(AS_t rc, /* 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, 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 ******************************** */ -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, sg_platf_route_cbarg_t route); +//XBT_PRIVATE void model_floyd_parse_route(AS_t rc, sg_platf_route_cbarg_t route); -/* ************************************************** */ -/* ************** Cluster ROUTING **************** */ - -AsPtr model_cluster_create(void); /* create structures for cluster routing model */ -AsPtr model_torus_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_PEER(peername) bprintf("link_%s", peername) -/* ************************************************************************** */ -/* ********** Dijkstra & Dijkstra Cached ROUTING **************************** */ -AS_t model_dijkstra_both_create(int cached); /* create by calling dijkstra or dijkstracache */ -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, 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, 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); +XBT_PRIVATE xbt_node_t new_xbt_graph_node (xbt_graph_t graph, const char *name, xbt_dict_t nodes); +XBT_PRIVATE 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 */