X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/73cac04c5ce217e495a7584c98a6dbd940552e9c..9e8d76f5eb3db584150db55fc3929623188b6b08:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 3d1fd6ab31..f18024e93f 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -8,6 +8,27 @@ #include /* regular expression library */ #endif #include "surf_routing_private.h" +#include "surf/surf_routing.h" + +xbt_lib_t host_lib; +int ROUTING_HOST_LEVEL; //Routing level +int SURF_CPU_LEVEL; //Surf cpu level +int SURF_WKS_LEVEL; //Surf workstation level +int SIMIX_HOST_LEVEL; //Simix level +int MSG_HOST_LEVEL; //Msg level +int SD_HOST_LEVEL; //Simdag level +int COORD_HOST_LEVEL; //Coordinates level +int NS3_HOST_LEVEL; //host node for ns3 + +xbt_lib_t link_lib; +int SD_LINK_LEVEL; //Simdag level +int SURF_LINK_LEVEL; //Surf level +int NS3_LINK_LEVEL; //link for ns3 + +xbt_lib_t as_router_lib; +int ROUTING_ASR_LEVEL; //Routing level +int COORD_ASR_LEVEL; //Coordinates level +int NS3_ASR_LEVEL; //host node for ns3 static xbt_dict_t patterns = NULL; static xbt_dict_t random_value = NULL; @@ -27,7 +48,6 @@ static double_f_cpvoid_t get_link_latency = NULL; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); -static void routing_parse_Scluster(void); /* cluster bypass */ static void routing_parse_Speer(void); /* peer bypass */ static void routing_parse_Srandom(void); /* random bypass */ static void routing_parse_Erandom(void); /* random bypass */ @@ -1529,7 +1549,7 @@ static void routing_parse_Econfig(void) XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); } -static void routing_parse_Scluster(void) +void routing_parse_Scluster(void) { static int AX_ptr = 0;