X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0891bb811cbad72a36e0aa215ab5ea6cb1a73640..b23f76c819d776be7e164c27102a3dd969ca2880:/src/surf/surf_routing.c
diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 51cc7f2a3b..3428327e5f 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -25,17 +25,22 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
routing_global_t global_routing = NULL;
routing_component_t current_routing = NULL;
model_type_t current_routing_model = NULL;
+static double_f_cpvoid_t get_link_latency = NULL;
/* Prototypes of each model */
static void *model_full_create(void); /* create structures for full routing model */
static void model_full_load(void); /* load parse functions for full routing model */
static void model_full_unload(void); /* unload parse functions for full routing model */
static void model_full_end(void); /* finalize the creation of full routing model */
+static void model_full_set_route( /* Set the route and ASroute between src and dst */
+ routing_component_t rc, const char *src, const char *dst, name_route_extended_t route);
static void *model_floyd_create(void); /* create structures for floyd routing model */
static void model_floyd_load(void); /* load parse functions for floyd routing model */
static void model_floyd_unload(void); /* unload parse functions for floyd routing model */
static void model_floyd_end(void); /* finalize the creation of floyd routing model */
+static void model_floyd_set_route(routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route);
static void *model_dijkstra_both_create(int cached); /* create by calling dijkstra or dijkstracache */
static void *model_dijkstra_create(void); /* create structures for dijkstra routing model */
@@ -43,6 +48,8 @@ static void *model_dijkstracache_create(void); /* create structures for dijkstr
static void model_dijkstra_both_load(void); /* load parse functions for dijkstra routing model */
static void model_dijkstra_both_unload(void); /* unload parse functions for dijkstra routing model */
static void model_dijkstra_both_end(void); /* finalize the creation of dijkstra routing model */
+static void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route);
static void *model_rulebased_create(void); /* create structures for rulebased routing model */
static void model_rulebased_load(void); /* load parse functions for rulebased routing model */
@@ -54,9 +61,10 @@ static void model_none_load(void); /* none routing model */
static void model_none_unload(void); /* none routing model */
static void model_none_end(void); /* none routing model */
-static void routing_full_parse_Scluster(void); /*cluster bypass */
+static void routing_parse_Scluster(void); /*cluster bypass */
-static void parse_Sconfig(void); /*config Tag */
+static void routing_parse_Sconfig(void); /*config Tag */
+static void routing_parse_Econfig(void); /*config Tag */
/* this lines are only for replace use like index in the model table */
typedef enum {
@@ -106,17 +114,17 @@ static void generic_set_processing_unit(routing_component_t rc,
const char *name);
static void generic_set_autonomous_system(routing_component_t rc,
const char *name);
-static void generic_set_route(routing_component_t rc, const char *src,
- const char *dst, route_t route);
-static void generic_set_ASroute(routing_component_t rc, const char *src,
- const char *dst, route_extended_t e_route);
static void generic_set_bypassroute(routing_component_t rc,
const char *src, const char *dst,
route_extended_t e_route);
+static int surf_link_resource_cmp(const void *a, const void *b);
+static int surf_pointer_resource_cmp(const void *a, const void *b);
+
/* ************************************************************************** */
/* *************** GENERIC BUSINESS METHODS (declarations) ****************** */
+static double generic_get_link_latency(routing_component_t rc, const char *src, const char *dst);
static xbt_dynar_t generic_get_onelink_routes(routing_component_t rc);
static route_extended_t generic_get_bypassroute(routing_component_t rc,
const char *src,
@@ -128,6 +136,9 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc,
static route_extended_t
generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
void *data, int order);
+static route_t
+generic_new_route(e_surf_routing_hierarchy_t hierarchy,
+ void *data, int order);
static void generic_free_route(route_t route);
static void generic_free_extended_route(route_extended_t e_route);
static routing_component_t
@@ -141,12 +152,11 @@ static void generic_src_dst_check(routing_component_t rc, const char *src,
/* **************************** GLOBAL FUNCTIONS **************************** */
/* global parse functions */
-static char *src = NULL; /* temporary store the source name of a route */
-static char *dst = NULL; /* temporary store the destination name of a route */
+static const char *src = NULL; /* temporary store the source name of a route */
+static const char *dst = NULL; /* temporary store the destination name of a route */
static char *gw_src = NULL; /* temporary store the gateway source name of a route */
static char *gw_dst = NULL; /* temporary store the gateway destination name of a route */
static xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */
-
/**
* \brief Add a "host" to the network element list
*/
@@ -157,7 +167,7 @@ static void parse_S_host(char *host_id)
current_routing->hierarchy = SURF_ROUTING_BASE;
xbt_assert1(!xbt_dict_get_or_null
(global_routing->where_network_elements, host_id),
- "Reading a host, processing unit \"%s\" already exist",
+ "Reading a host, processing unit \"%s\" already exists",
host_id);
xbt_assert1(current_routing->set_processing_unit,
"no defined method \"set_processing_unit\" in \"%s\"",
@@ -186,9 +196,6 @@ static void parse_S_host_lua(char *host_id)
parse_S_host(host_id);
}
-/*
- *
- */
/**
* \brief Add a "router" to the network element list
@@ -202,7 +209,7 @@ static void parse_S_router(void)
xbt_assert1(!xbt_dict_get_or_null
(global_routing->where_network_elements,
A_surfxml_router_id),
- "Reading a router, processing unit \"%s\" already exist",
+ "Reading a router, processing unit \"%s\" already exists",
A_surfxml_router_id);
xbt_assert1(current_routing->set_processing_unit,
"no defined method \"set_processing_unit\" in \"%s\"",
@@ -222,7 +229,7 @@ static void parse_S_router(void)
/**
* \brief Set the endponints for a route
*/
-static void parse_S_route_new_and_endpoints(char *src_id, char *dst_id)
+static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
{
if (src != NULL && dst != NULL && link_list != NULL)
THROW2(arg_error, 0, "Route between %s to %s can not be defined",
@@ -236,7 +243,7 @@ static void parse_S_route_new_and_endpoints(char *src_id, char *dst_id)
}
/**
- * \breif Set the endpoints for a route from XML
+ * \brief Set the endpoints for a route from XML
*/
static void parse_S_route_new_and_endpoints_XML(void)
{
@@ -245,9 +252,9 @@ static void parse_S_route_new_and_endpoints_XML(void)
}
/**
- * \breif Set the endpoints for a route from lua
+ * \brief Set the endpoints for a route from lua
*/
-static void parse_S_route_new_and_endpoints_lua(char *id_src, char *id_dst)
+static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst)
{
parse_S_route_new_and_endpoints(id_src, id_dst);
}
@@ -307,7 +314,18 @@ static void parse_E_link_ctn_new_elem(char *link_id)
static void parse_E_link_ctn_new_elem_XML(void)
{
- parse_E_link_ctn_new_elem(A_surfxml_link_ctn_id);
+ if (A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_NONE)
+ parse_E_link_ctn_new_elem(A_surfxml_link_ctn_id);
+ if (A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_UP) {
+ char *link_id = bprintf("%s_UP", A_surfxml_link_ctn_id);
+ parse_E_link_ctn_new_elem(link_id);
+ free(link_id);
+ }
+ if (A_surfxml_link_ctn_direction == A_surfxml_link_ctn_direction_DOWN) {
+ char *link_id = bprintf("%s_DOWN", A_surfxml_link_ctn_id);
+ parse_E_link_ctn_new_elem(link_id);
+ free(link_id);
+ }
}
/**
@@ -315,7 +333,6 @@ static void parse_E_link_ctn_new_elem_XML(void)
*/
static void parse_E_link_c_ctn_new_elem_lua(char *link_id)
{
-
parse_E_link_ctn_new_elem(link_id);
}
@@ -324,10 +341,8 @@ static void parse_E_link_c_ctn_new_elem_lua(char *link_id)
*/
static void parse_E_route_store_route(void)
{
- route_t route = xbt_new0(s_route_t, 1);
- route->link_list = link_list;
-// xbt_assert1(generic_processing_units_exist(current_routing,src),"the \"%s\" processing units gateway does not exist",src);
-// xbt_assert1(generic_processing_units_exist(current_routing,dst),"the \"%s\" processing units gateway does not exist",dst);
+ name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1);
+ route->generic_route.link_list = link_list;
xbt_assert1(current_routing->set_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
@@ -342,14 +357,10 @@ static void parse_E_route_store_route(void)
*/
static void parse_E_ASroute_store_route(void)
{
- route_extended_t e_route = xbt_new0(s_route_extended_t, 1);
+ name_route_extended_t e_route = xbt_new0(s_name_route_extended_t, 1);
e_route->generic_route.link_list = link_list;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
-// xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
-// xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
-// xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
-// xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst);
xbt_assert1(current_routing->set_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
@@ -370,10 +381,6 @@ static void parse_E_bypassRoute_store_route(void)
e_route->generic_route.link_list = link_list;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
-// xbt_assert1(generic_autonomous_system_exist(current_routing,src),"the \"%s\" autonomous system does not exist",src);
-// xbt_assert1(generic_autonomous_system_exist(current_routing,dst),"the \"%s\" autonomous system does not exist",dst);
-// xbt_assert1(generic_processing_units_exist(current_routing,gw_src),"the \"%s\" processing units gateway does not exist",gw_src);
-// xbt_assert1(generic_processing_units_exist(current_routing,gw_dst),"the \"%s\" processing units gateway does not exist",gw_dst);
xbt_assert1(current_routing->set_bypassroute,
"no defined method \"set_bypassroute\" in \"%s\"",
current_routing->name);
@@ -419,7 +426,6 @@ static void parse_S_AS(char *AS_id, char *AS_routing)
new_routing->hierarchy = SURF_ROUTING_NULL;
new_routing->name = xbt_strdup(AS_id);
new_routing->routing_sons = xbt_dict_new();
- //INFO2("Routing %s for AS %s",A_surfxml_AS_routing,A_surfxml_AS_id);
if (current_routing == NULL && global_routing->root == NULL) {
@@ -431,7 +437,7 @@ static void parse_S_AS(char *AS_id, char *AS_routing)
xbt_assert1(!xbt_dict_get_or_null
(current_routing->routing_sons, AS_id),
- "The AS \"%s\" already exist", AS_id);
+ "The AS \"%s\" already exists", AS_id);
/* it is a part of the tree */
new_routing->routing_father = current_routing;
/* set the father behavior */
@@ -486,7 +492,7 @@ static void parse_E_AS(char *AS_id)
network_element_info_t info = NULL;
xbt_assert1(!xbt_dict_get_or_null
(global_routing->where_network_elements,
- current_routing->name), "The AS \"%s\" already exist",
+ current_routing->name), "The AS \"%s\" already exists",
current_routing->name);
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing->routing_father;
@@ -571,8 +577,8 @@ static xbt_dynar_t elements_father(const char *src, const char *dst)
}
/* (3) find the common father */
- index_src = (path_src->used) - 1;
- index_dst = (path_dst->used) - 1;
+ index_src = path_src->used - 1;
+ index_dst = path_dst->used - 1;
current_src = xbt_dynar_get_ptr(path_src, index_src);
current_dst = xbt_dynar_get_ptr(path_dst, index_dst);
while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) {
@@ -716,6 +722,118 @@ static route_extended_t _get_route(const char *src, const char *dst)
return e_route;
}
+static double _get_latency(const char *src, const char *dst)
+{
+
+ double latency, latency_src, latency_dst = 0.0;
+
+ DEBUG2("Solve route \"%s\" to \"%s\"", src, dst);
+
+ xbt_assert0(src && dst, "bad parameters for \"_get_route\" method");
+
+ route_extended_t e_route, e_route_cnt;
+
+ xbt_dynar_t elem_father_list = elements_father(src, dst);
+
+ routing_component_t common_father =
+ xbt_dynar_get_as(elem_father_list, 0, routing_component_t);
+ routing_component_t src_father =
+ xbt_dynar_get_as(elem_father_list, 1, routing_component_t);
+ routing_component_t dst_father =
+ xbt_dynar_get_as(elem_father_list, 2, routing_component_t);
+
+ e_route = xbt_new0(s_route_extended_t, 1);
+ e_route->src_gateway = NULL;
+ e_route->dst_gateway = NULL;
+ e_route->generic_route.link_list =
+ xbt_dynar_new(global_routing->size_of_link, NULL);
+
+ if (src_father == dst_father) { /* SURF_ROUTING_BASE */
+
+ if (strcmp(src, dst)) {
+ latency =
+ (*(common_father->get_latency)) (common_father, src, dst);
+ xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"", src,
+ dst);
+ } else latency = 0;
+ } else { /* SURF_ROUTING_RECURSIVE */
+ route_extended_t e_route_bypass = NULL;
+
+ if (common_father->get_bypass_route)
+ e_route_bypass =
+ (*(common_father->get_bypass_route)) (common_father, src, dst);
+
+ xbt_assert0(!e_route_bypass,"Bypass cannot work yet with get_latency");
+
+ e_route_cnt =
+ (*(common_father->get_route)) (common_father, src_father->name,
+ dst_father->name);
+
+ xbt_assert2(e_route_cnt, "no route between \"%s\" and \"%s\"",
+ src_father->name, dst_father->name);
+
+ xbt_assert2((e_route_cnt->src_gateway == NULL) ==
+ (e_route_cnt->dst_gateway == NULL),
+ "bad gateway for route between \"%s\" and \"%s\"", src,
+ dst);
+ latency =
+ (*(common_father->get_latency)) (common_father, src_father->name,
+ dst_father->name);
+ xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"",
+ src_father->name, dst_father->name);
+
+
+ if (src != e_route_cnt->src_gateway) {
+ /*
+ e_route_src = _get_route(src, e_route_cnt->src_gateway);
+ xbt_assert2(e_route_src, "no route between \"%s\" and \"%s\"", src,
+ e_route_cnt->src_gateway);
+ xbt_dynar_foreach(e_route_src->generic_route.link_list, cpt, link) {
+ xbt_dynar_push(e_route->generic_route.link_list, &link);
+ }
+ */
+ latency_src = _get_latency(src, e_route_cnt->src_gateway);
+ xbt_assert2(latency_src>=0, "no route between \"%s\" and \"%s\"", src,
+ e_route_cnt->src_gateway);
+ latency += latency_src;
+ }
+
+ /*
+ xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
+ xbt_dynar_push(e_route->generic_route.link_list, &link);
+ }
+ */
+
+ if (e_route_cnt->dst_gateway != dst) {
+ /*
+ e_route_dst = _get_route(e_route_cnt->dst_gateway, dst);
+ xbt_assert2(e_route_dst, "no route between \"%s\" and \"%s\"",
+ e_route_cnt->dst_gateway, dst);
+ xbt_dynar_foreach(e_route_dst->generic_route.link_list, cpt, link) {
+ xbt_dynar_push(e_route->generic_route.link_list, &link);
+ }
+ */
+ latency_dst = _get_latency(e_route_cnt->dst_gateway, dst);
+ xbt_assert2(latency_dst>=0, "no route between \"%s\" and \"%s\"",
+ e_route_cnt->dst_gateway, dst);
+ latency += latency_dst;
+ }
+
+ /*
+ e_route->src_gateway = xbt_strdup(e_route_cnt->src_gateway);
+ e_route->dst_gateway = xbt_strdup(e_route_cnt->dst_gateway);
+
+ generic_free_extended_route(e_route_src);
+ generic_free_extended_route(e_route_cnt);
+ generic_free_extended_route(e_route_dst);
+ */
+ }
+
+ xbt_dynar_free(&elem_father_list);
+
+ return latency;
+}
+
/**
* \brief Generic method: find a route between hosts
*
@@ -723,7 +841,8 @@ static route_extended_t _get_route(const char *src, const char *dst)
* \param dst the destination host name
*
* walk through the routing components tree and find a route between hosts
- * by calling the differents "get_route" functions in each routing component
+ * by calling the differents "get_route" functions in each routing component.
+ * No need to free the returned dynar. It will be freed at the next call.
*/
static xbt_dynar_t get_route(const char *src, const char *dst)
{
@@ -758,6 +877,42 @@ static xbt_dynar_t get_route(const char *src, const char *dst)
return global_routing->last_route;
}
+/**
+ * \brief Generic method: find a route between hosts
+ *
+ * \param src the source host name
+ * \param dst the destination host name
+ *
+ * walk through the routing components tree and find a route between hosts
+ * by calling the differents "get_route" functions in each routing component.
+ * Leaves the caller the responsability to clean the returned dynar.
+ */
+static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst)
+{
+ xbt_dynar_t d = get_route(src,dst);
+ global_routing->last_route = NULL;
+ return d;
+}
+
+/*Get Latency*/
+static double get_latency(const char *src, const char *dst)
+{
+
+ double latency = -1.0;
+ xbt_dynar_t elem_father_list = elements_father(src, dst);
+ routing_component_t common_father =
+ xbt_dynar_get_as(elem_father_list, 0, routing_component_t);
+
+ if (strcmp(src, dst))
+ latency = _get_latency(src, dst);
+ else
+ latency = (*(common_father->get_latency)) (common_father, src, dst);
+
+ xbt_assert2(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst);
+
+ return latency;
+}
+
/**
* \brief Recursive function for finalize
*
@@ -849,7 +1004,7 @@ static e_surf_network_element_type_t get_network_element_type(const char
*
* Make a global routing structure and set all the parsing functions.
*/
-void routing_model_create(size_t size_of_links, void *loopback)
+void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_t get_link_latency_fun)
{
/* config the uniq global routing */
@@ -857,13 +1012,15 @@ void routing_model_create(size_t size_of_links, void *loopback)
global_routing->where_network_elements = xbt_dict_new();
global_routing->root = NULL;
global_routing->get_route = get_route;
+ global_routing->get_latency = get_latency;
+ global_routing->get_route_no_cleanup = get_route_no_cleanup;
global_routing->get_onelink_routes = get_onelink_routes;
global_routing->get_network_element_type = get_network_element_type;
global_routing->finalize = finalize;
global_routing->loopback = loopback;
global_routing->size_of_link = size_of_links;
- global_routing->last_route = xbt_dynar_new(size_of_links, NULL);
-
+ global_routing->last_route = NULL;
+ get_link_latency = get_link_latency_fun;
/* no current routing at moment */
current_routing = NULL;
@@ -892,9 +1049,12 @@ void routing_model_create(size_t size_of_links, void *loopback)
surfxml_add_callback(ETag_surfxml_AS_cb_list, &parse_E_AS_XML);
surfxml_add_callback(STag_surfxml_cluster_cb_list,
- &routing_full_parse_Scluster);
+ &routing_parse_Scluster);
- surfxml_add_callback(STag_surfxml_config_cb_list, &parse_Sconfig);
+ surfxml_add_callback(STag_surfxml_config_cb_list,
+ &routing_parse_Sconfig);
+ surfxml_add_callback(ETag_surfxml_config_cb_list,
+ &routing_parse_Econfig);
}
/* ************************************************************************** */
@@ -906,9 +1066,6 @@ void routing_model_create(size_t size_of_links, void *loopback)
typedef struct {
s_routing_component_t generic_routing;
- xbt_dict_t parse_routes; /* store data during the parse process */
- xbt_dict_t to_index; /* char* -> network_element_t */
- xbt_dict_t bypassRoutes;
route_extended_t *routing_table;
} s_routing_component_full_t, *routing_component_full_t;
@@ -918,13 +1075,13 @@ static xbt_dynar_t full_get_onelink_routes(routing_component_t rc)
xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
routing_component_full_t routing = (routing_component_full_t) rc;
- int table_size = xbt_dict_length(routing->to_index);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
xbt_dict_cursor_t c1 = NULL, c2 = NULL;
char *k1, *d1, *k2, *d2;
- xbt_dict_foreach(routing->to_index, c1, k1, d1) {
- xbt_dict_foreach(routing->to_index, c2, k2, d2) {
- int *src_id = xbt_dict_get_or_null(routing->to_index, k1);
- int *dst_id = xbt_dict_get_or_null(routing->to_index, k2);
+ xbt_dict_foreach(routing->generic_routing.to_index, c1, k1, d1) {
+ xbt_dict_foreach(routing->generic_routing.to_index, c2, k2, d2) {
+ int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, k1);
+ int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, k2);
xbt_assert2(src_id
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
@@ -963,11 +1120,11 @@ static route_extended_t full_get_route(routing_component_t rc,
/* set utils vars */
routing_component_full_t routing = (routing_component_full_t) rc;
- int table_size = xbt_dict_length(routing->to_index);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
generic_src_dst_check(rc, src, dst);
- int *src_id = xbt_dict_get_or_null(routing->to_index, src);
- int *dst_id = xbt_dict_get_or_null(routing->to_index, dst);
+ int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
+ int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst);
xbt_assert2(src_id
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
@@ -996,7 +1153,7 @@ static route_extended_t full_get_route(routing_component_t rc,
static void full_finalize(routing_component_t rc)
{
routing_component_full_t routing = (routing_component_full_t) rc;
- int table_size = xbt_dict_length(routing->to_index);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
int i, j;
if (routing) {
/* Delete routing table */
@@ -1005,9 +1162,9 @@ static void full_finalize(routing_component_t rc)
generic_free_extended_route(TO_ROUTE_FULL(i, j));
xbt_free(routing->routing_table);
/* Delete bypass dict */
- xbt_dict_free(&routing->bypassRoutes);
+ xbt_dict_free(&rc->bypassRoutes);
/* Delete index dict */
- xbt_dict_free(&(routing->to_index));
+ xbt_dict_free(&rc->to_index);
/* Delete structure */
xbt_free(rc);
}
@@ -1023,18 +1180,18 @@ static void *model_full_create(void)
generic_set_processing_unit;
new_component->generic_routing.set_autonomous_system =
generic_set_autonomous_system;
- new_component->generic_routing.set_route = generic_set_route;
- new_component->generic_routing.set_ASroute = generic_set_ASroute;
+ new_component->generic_routing.set_route = model_full_set_route;
+ new_component->generic_routing.set_ASroute = model_full_set_route;
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = full_get_route;
+ new_component->generic_routing.get_latency = generic_get_link_latency;
new_component->generic_routing.get_onelink_routes =
full_get_onelink_routes;
new_component->generic_routing.get_bypass_route =
generic_get_bypassroute;
new_component->generic_routing.finalize = full_finalize;
- new_component->to_index = xbt_dict_new();
- new_component->bypassRoutes = xbt_dict_new();
- new_component->parse_routes = xbt_dict_new();
+ new_component->generic_routing.to_index = xbt_dict_new();
+ new_component->generic_routing.bypassRoutes = xbt_dict_new();
return new_component;
}
@@ -1050,46 +1207,17 @@ static void model_full_unload(void)
static void model_full_end(void)
{
-
- char *key, *end;
- const char *sep = "#";
- int src_id, dst_id;
- unsigned int i, j;
- route_t route;
+ unsigned int i;
route_extended_t e_route;
- void *data;
-
- xbt_dict_cursor_t cursor = NULL;
- xbt_dynar_t keys = NULL;
/* set utils vars */
routing_component_full_t routing =
((routing_component_full_t) current_routing);
- int table_size = xbt_dict_length(routing->to_index);
-
- /* Create the routing table */
- routing->routing_table =
- xbt_new0(route_extended_t, table_size * table_size);
-
- /* Put the routes in position */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
- keys = xbt_str_split_str(key, sep);
- src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
- dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
- TO_ROUTE_FULL(src_id, dst_id) =
- generic_new_extended_route(current_routing->hierarchy, data, 1);
- xbt_dynar_free(&keys);
- }
-
- /* delete the parse table */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
- route = (route_t) data;
- xbt_dynar_free(&(route->link_list));
- xbt_free(data);
- }
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
- /* delete parse dict */
- xbt_dict_free(&(routing->parse_routes));
+ /* Create table if necessary */
+ if(!routing->routing_table)
+ routing->routing_table = xbt_new0(route_extended_t, table_size * table_size);
/* Add the loopback if needed */
if (current_routing->hierarchy == SURF_ROUTING_BASE) {
@@ -1107,18 +1235,103 @@ static void model_full_end(void)
}
}
}
+}
- /* Shrink the dynar routes (save unused slots) */
- for (i = 0; i < table_size; i++)
- for (j = 0; j < table_size; j++)
- if (TO_ROUTE_FULL(i, j))
- xbt_dynar_shrink(TO_ROUTE_FULL(i, j)->generic_route.link_list, 0);
+static void model_full_set_route(routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route)
+{
+ int *src_id, *dst_id;
+ src_id = xbt_dict_get_or_null(rc->to_index, src);
+ dst_id = xbt_dict_get_or_null(rc->to_index, dst);
+ routing_component_full_t routing = ((routing_component_full_t) rc);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
+
+ xbt_assert2(src_id
+ && dst_id, "Network elements %s or %s not found", src, dst);
+
+ xbt_assert2(xbt_dynar_length(route->generic_route.link_list) > 0,
+ "Invalid count of links, must be greater than zero (%s,%s)",
+ src, dst);
+
+ if(!routing->routing_table)
+ routing->routing_table = xbt_new0(route_extended_t, table_size * table_size);
+
+ if(TO_ROUTE_FULL(*src_id, *dst_id))
+ {
+ char * link_name;
+ unsigned int i;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+ xbt_dynar_foreach(route->generic_route.link_list,i,link_name)
+ {
+ void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+ xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exists", src,dst);
+ xbt_free(link_route_to_test);
+ }
+ else
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ route->src_gateway, dst, route->dst_gateway);
+ TO_ROUTE_FULL(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy,route,1);
+ xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, 0);
+ }
+
+ if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
+ || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
+ {
+ if(route->dst_gateway && route->src_gateway)
+ {
+ char *gw_src = xbt_strdup(route->src_gateway);
+ char *gw_dst = xbt_strdup(route->dst_gateway);
+ route->src_gateway = gw_dst;
+ route->dst_gateway = gw_src;
+ }
+ if(TO_ROUTE_FULL(*dst_id, *src_id))
+ {
+ char * link_name;
+ unsigned int i;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+ for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--)
+ {
+ link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
+ void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+ xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exists", src,dst);
+ xbt_free(link_route_to_test);
+ }
+ else
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ route->src_gateway, src, route->dst_gateway);
+ TO_ROUTE_FULL(*dst_id, *src_id) = generic_new_extended_route(rc->hierarchy,route,0);
+ xbt_dynar_shrink(TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, 0);
+ }
+
+ }
}
/* ************************************************************************** */
/* *************************** FLOYD ROUTING ******************************** */
-#define TO_FLOYD_COST(i,j) cost_table[(i)+(j)*table_size]
+#define TO_FLOYD_COST(i,j) (routing->cost_table)[(i)+(j)*table_size]
#define TO_FLOYD_PRED(i,j) (routing->predecessor_table)[(i)+(j)*table_size]
#define TO_FLOYD_LINK(i,j) (routing->link_table)[(i)+(j)*table_size]
@@ -1128,11 +1341,8 @@ typedef struct {
s_routing_component_t generic_routing;
/* vars for calculate the floyd algorith. */
int *predecessor_table;
+ double *cost_table;
route_extended_t *link_table; /* char* -> int* */
- xbt_dict_t to_index;
- xbt_dict_t bypassRoutes;
- /* store data during the parse process */
- xbt_dict_t parse_routes;
} s_routing_component_floyd_t, *routing_component_floyd_t;
static route_extended_t floyd_get_route(routing_component_t rc,
@@ -1144,11 +1354,11 @@ static xbt_dynar_t floyd_get_onelink_routes(routing_component_t rc)
xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free);
routing_component_floyd_t routing = (routing_component_floyd_t) rc;
- //int table_size = xbt_dict_length(routing->to_index);
+ //size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
xbt_dict_cursor_t c1 = NULL, c2 = NULL;
char *k1, *d1, *k2, *d2;
- xbt_dict_foreach(routing->to_index, c1, k1, d1) {
- xbt_dict_foreach(routing->to_index, c2, k2, d2) {
+ xbt_dict_foreach(routing->generic_routing.to_index, c1, k1, d1) {
+ xbt_dict_foreach(routing->generic_routing.to_index, c2, k2, d2) {
route_extended_t route = floyd_get_route(rc, k1, k2);
if (route) {
if (xbt_dynar_length(route->generic_route.link_list) == 1) {
@@ -1183,11 +1393,11 @@ static route_extended_t floyd_get_route(routing_component_t rc,
/* set utils vars */
routing_component_floyd_t routing = (routing_component_floyd_t) rc;
- int table_size = xbt_dict_length(routing->to_index);
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
generic_src_dst_check(rc, src, dst);
- int *src_id = xbt_dict_get_or_null(routing->to_index, src);
- int *dst_id = xbt_dict_get_or_null(routing->to_index, dst);
+ int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
+ int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst);
xbt_assert2(src_id
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
@@ -1264,18 +1474,19 @@ static route_extended_t floyd_get_route(routing_component_t rc,
static void floyd_finalize(routing_component_t rc)
{
routing_component_floyd_t routing = (routing_component_floyd_t) rc;
- int i, j, table_size;
+ int i, j;
+ size_t table_size;
if (routing) {
- table_size = xbt_dict_length(routing->to_index);
+ table_size = xbt_dict_length(routing->generic_routing.to_index);
/* Delete link_table */
for (i = 0; i < table_size; i++)
for (j = 0; j < table_size; j++)
generic_free_extended_route(TO_FLOYD_LINK(i, j));
xbt_free(routing->link_table);
/* Delete bypass dict */
- xbt_dict_free(&routing->bypassRoutes);
+ xbt_dict_free(&routing->generic_routing.bypassRoutes);
/* Delete index dict */
- xbt_dict_free(&(routing->to_index));
+ xbt_dict_free(&(routing->generic_routing.to_index));
/* Delete dictionary index dict, predecessor and links table */
xbt_free(routing->predecessor_table);
/* Delete structure */
@@ -1291,18 +1502,18 @@ static void *model_floyd_create(void)
generic_set_processing_unit;
new_component->generic_routing.set_autonomous_system =
generic_set_autonomous_system;
- new_component->generic_routing.set_route = generic_set_route;
- new_component->generic_routing.set_ASroute = generic_set_ASroute;
+ new_component->generic_routing.set_route = model_floyd_set_route;
+ new_component->generic_routing.set_ASroute = model_floyd_set_route;
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = floyd_get_route;
+ new_component->generic_routing.get_latency = generic_get_link_latency;
new_component->generic_routing.get_onelink_routes =
floyd_get_onelink_routes;
new_component->generic_routing.get_bypass_route =
generic_get_bypassroute;
new_component->generic_routing.finalize = floyd_finalize;
- new_component->to_index = xbt_dict_new();
- new_component->bypassRoutes = xbt_dict_new();
- new_component->parse_routes = xbt_dict_new();
+ new_component->generic_routing.to_index = xbt_dict_new();
+ new_component->generic_routing.bypassRoutes = xbt_dict_new();
return new_component;
}
@@ -1319,92 +1530,183 @@ static void model_floyd_unload(void)
static void model_floyd_end(void)
{
- routing_component_floyd_t routing =
- ((routing_component_floyd_t) current_routing);
- xbt_dict_cursor_t cursor = NULL;
- double *cost_table;
- char *key, *data, *end;
- const char *sep = "#";
- xbt_dynar_t keys;
- int src_id, dst_id;
- unsigned int i, j, a, b, c;
-
- /* set the size of inicial table */
- int table_size = xbt_dict_length(routing->to_index);
-
- /* Create Cost, Predecessor and Link tables */
- cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */
- routing->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */
- routing->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */
-
- /* Initialize costs and predecessors */
- for (i = 0; i < table_size; i++)
- for (j = 0; j < table_size; j++) {
- TO_FLOYD_COST(i, j) = DBL_MAX;
- TO_FLOYD_PRED(i, j) = -1;
- TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */
- }
-
- /* Put the routes in position */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
- keys = xbt_str_split_str(key, sep);
- src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
- dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
- TO_FLOYD_LINK(src_id, dst_id) =
- generic_new_extended_route(current_routing->hierarchy, data, 0);
- TO_FLOYD_PRED(src_id, dst_id) = src_id;
- /* set link cost */
- TO_FLOYD_COST(src_id, dst_id) = ((TO_FLOYD_LINK(src_id, dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
- xbt_dynar_free(&keys);
- }
-
- /* Add the loopback if needed */
- if (current_routing->hierarchy == SURF_ROUTING_BASE) {
- for (i = 0; i < table_size; i++) {
- route_extended_t e_route = TO_FLOYD_LINK(i, i);
- if (!e_route) {
- e_route = xbt_new0(s_route_extended_t, 1);
- e_route->src_gateway = NULL;
- e_route->dst_gateway = NULL;
- e_route->generic_route.link_list =
- xbt_dynar_new(global_routing->size_of_link, NULL);
- xbt_dynar_push(e_route->generic_route.link_list,
- &global_routing->loopback);
- TO_FLOYD_LINK(i, i) = e_route;
- TO_FLOYD_PRED(i, i) = i;
- TO_FLOYD_COST(i, i) = 1;
- }
- }
- }
- /* Calculate path costs */
- for (c = 0; c < table_size; c++) {
- for (a = 0; a < table_size; a++) {
- for (b = 0; b < table_size; b++) {
- if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) {
- if (TO_FLOYD_COST(a, b) == DBL_MAX ||
- (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) <
- TO_FLOYD_COST(a, b))) {
- TO_FLOYD_COST(a, b) =
- TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b);
- TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b);
- }
- }
- }
- }
- }
-
- /* delete the parse table */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
- route_t route = (route_t) data;
- xbt_dynar_free(&(route->link_list));
- xbt_free(data);
- }
-
- /* delete parse dict */
- xbt_dict_free(&(routing->parse_routes));
-
- /* cleanup */
- xbt_free(cost_table);
+ routing_component_floyd_t routing =
+ ((routing_component_floyd_t) current_routing);
+
+ unsigned int i, j, a, b, c;
+
+ /* set the size of table routing */
+ size_t table_size = xbt_dict_length(routing->generic_routing.to_index);
+
+ if(!routing->link_table)
+ {
+ /* Create Cost, Predecessor and Link tables */
+ routing->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */
+ routing->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */
+ routing->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */
+
+ /* Initialize costs and predecessors */
+ for (i = 0; i < table_size; i++)
+ for (j = 0; j < table_size; j++) {
+ TO_FLOYD_COST(i, j) = DBL_MAX;
+ TO_FLOYD_PRED(i, j) = -1;
+ TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */
+ }
+ }
+
+ /* Add the loopback if needed */
+ if (current_routing->hierarchy == SURF_ROUTING_BASE) {
+ for (i = 0; i < table_size; i++) {
+ route_extended_t e_route = TO_FLOYD_LINK(i, i);
+ if (!e_route) {
+ e_route = xbt_new0(s_route_extended_t, 1);
+ e_route->src_gateway = NULL;
+ e_route->dst_gateway = NULL;
+ e_route->generic_route.link_list =
+ xbt_dynar_new(global_routing->size_of_link, NULL);
+ xbt_dynar_push(e_route->generic_route.link_list,
+ &global_routing->loopback);
+ TO_FLOYD_LINK(i, i) = e_route;
+ TO_FLOYD_PRED(i, i) = i;
+ TO_FLOYD_COST(i, i) = 1;
+ }
+ }
+ }
+ /* Calculate path costs */
+ for (c = 0; c < table_size; c++) {
+ for (a = 0; a < table_size; a++) {
+ for (b = 0; b < table_size; b++) {
+ if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) {
+ if (TO_FLOYD_COST(a, b) == DBL_MAX ||
+ (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) <
+ TO_FLOYD_COST(a, b))) {
+ TO_FLOYD_COST(a, b) =
+ TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b);
+ TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b);
+ }
+ }
+ }
+ }
+ }
+}
+
+static void model_floyd_set_route(routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route)
+{
+ routing_component_floyd_t routing = (routing_component_floyd_t) rc;
+
+ /* set the size of table routing */
+ size_t table_size = xbt_dict_length(rc->to_index);
+ int *src_id, *dst_id;
+ int i,j;
+
+ src_id = xbt_dict_get_or_null(rc->to_index, src);
+ dst_id = xbt_dict_get_or_null(rc->to_index, dst);
+
+ if(!routing->link_table)
+ {
+ /* Create Cost, Predecessor and Link tables */
+ routing->cost_table = xbt_new0(double, table_size * table_size); /* link cost from host to host */
+ routing->predecessor_table = xbt_new0(int, table_size * table_size); /* predecessor host numbers */
+ routing->link_table = xbt_new0(route_extended_t, table_size * table_size); /* actual link between src and dst */
+
+ /* Initialize costs and predecessors */
+ for (i = 0; i < table_size; i++)
+ for (j = 0; j < table_size; j++) {
+ TO_FLOYD_COST(i, j) = DBL_MAX;
+ TO_FLOYD_PRED(i, j) = -1;
+ TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */
+ }
+ }
+
+ if(TO_FLOYD_LINK(*src_id, *dst_id))
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("See Route from \"%s\" to \"%s\"", src, dst);
+ else
+ DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ route->src_gateway, dst, route->dst_gateway);
+ char * link_name;
+ unsigned int cpt;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+ xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name)
+ {
+ void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+ xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exists", src,dst);
+ xbt_free(link_route_to_test);
+ }
+ else
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ route->src_gateway, dst, route->dst_gateway);
+
+ TO_FLOYD_LINK(*src_id, *dst_id) =
+ generic_new_extended_route(rc->hierarchy, route, 1);
+ TO_FLOYD_PRED(*src_id, *dst_id) = *src_id;
+ TO_FLOYD_COST(*src_id, *dst_id) =
+ ((TO_FLOYD_LINK(*src_id, *dst_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
+ }
+
+ if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
+ || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
+ {
+ if(TO_FLOYD_LINK(*dst_id, *src_id))
+ {
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("See Route from \"%s\" to \"%s\"", dst, src);
+ else
+ DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ route->src_gateway, src, route->dst_gateway);
+ char * link_name;
+ unsigned int i;
+ xbt_dynar_t link_route_to_test = xbt_dynar_new(global_routing->size_of_link, NULL);
+ for(i=xbt_dynar_length(route->generic_route.link_list) ;i>0 ;i--)
+ {
+ link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
+ void *link = xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+ xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_dynar_push(link_route_to_test,&link);
+ }
+ xbt_assert2(!xbt_dynar_compare(
+ (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list,
+ (void*)link_route_to_test,
+ (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
+ "The route between \"%s\" and \"%s\" already exists", src,dst);
+ xbt_free(link_route_to_test);
+ }
+ else
+ {
+ if(route->dst_gateway && route->src_gateway)
+ {
+ char *gw_src = xbt_strdup(route->src_gateway);
+ char *gw_dst = xbt_strdup(route->dst_gateway);
+ route->src_gateway = gw_dst;
+ route->dst_gateway = gw_src;
+ }
+
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ route->src_gateway, src, route->dst_gateway);
+
+ TO_FLOYD_LINK(*dst_id, *src_id) =
+ generic_new_extended_route(rc->hierarchy, route, 0);
+ TO_FLOYD_PRED(*dst_id, *src_id) = *dst_id;
+ TO_FLOYD_COST(*dst_id, *src_id) =
+ ((TO_FLOYD_LINK(*dst_id, *src_id))->generic_route.link_list)->used; /* count of links, old model assume 1 */
+ }
+ }
}
/* ************************************************************************** */
@@ -1412,13 +1714,10 @@ static void model_floyd_end(void)
typedef struct {
s_routing_component_t generic_routing;
- xbt_dict_t to_index;
- xbt_dict_t bypassRoutes;
xbt_graph_t route_graph; /* xbt_graph */
xbt_dict_t graph_node_map; /* map */
xbt_dict_t route_cache; /* use in cache mode */
int cached;
- xbt_dict_t parse_routes;
} s_routing_component_dijkstra_t, *routing_component_dijkstra_t;
@@ -1597,8 +1896,8 @@ static route_extended_t dijkstra_get_route(routing_component_t rc,
routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
generic_src_dst_check(rc, src, dst);
- int *src_id = xbt_dict_get_or_null(routing->to_index, src);
- int *dst_id = xbt_dict_get_or_null(routing->to_index, dst);
+ int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src);
+ int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst);
xbt_assert2(src_id
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
@@ -1804,9 +2103,9 @@ static void dijkstra_finalize(routing_component_t rc)
if (routing->cached)
xbt_dict_free(&routing->route_cache);
/* Delete bypass dict */
- xbt_dict_free(&routing->bypassRoutes);
+ xbt_dict_free(&routing->generic_routing.bypassRoutes);
/* Delete index dict */
- xbt_dict_free(&(routing->to_index));
+ xbt_dict_free(&(routing->generic_routing.to_index));
/* Delete structure */
xbt_free(routing);
}
@@ -1822,19 +2121,19 @@ static void *model_dijkstra_both_create(int cached)
generic_set_processing_unit;
new_component->generic_routing.set_autonomous_system =
generic_set_autonomous_system;
- new_component->generic_routing.set_route = generic_set_route;
- new_component->generic_routing.set_ASroute = generic_set_ASroute;
+ new_component->generic_routing.set_route = model_dijkstra_both_set_route;
+ new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route; //TODO
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = dijkstra_get_route;
+ new_component->generic_routing.get_latency = generic_get_link_latency;
new_component->generic_routing.get_onelink_routes =
dijkstra_get_onelink_routes;
new_component->generic_routing.get_bypass_route =
generic_get_bypassroute;
new_component->generic_routing.finalize = dijkstra_finalize;
new_component->cached = cached;
- new_component->to_index = xbt_dict_new();
- new_component->bypassRoutes = xbt_dict_new();
- new_component->parse_routes = xbt_dict_new();
+ new_component->generic_routing.to_index = xbt_dict_new();
+ new_component->generic_routing.bypassRoutes = xbt_dict_new();
return new_component;
}
@@ -1862,44 +2161,18 @@ static void model_dijkstra_both_end(void)
{
routing_component_dijkstra_t routing =
(routing_component_dijkstra_t) current_routing;
- xbt_dict_cursor_t cursor = NULL;
- char *key, *data, *end;
- const char *sep = "#";
- xbt_dynar_t keys;
+
xbt_node_t node = NULL;
unsigned int cursor2;
xbt_dynar_t nodes = NULL;
- int src_id, dst_id;
- route_t route;
/* Create the topology graph */
routing->route_graph = xbt_graph_new_graph(1, NULL);
routing->graph_node_map = xbt_dict_new();
- if (routing->cached)
+ if (routing->cached && !routing->route_cache)
routing->route_cache = xbt_dict_new();
- /* Put the routes in position */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
- keys = xbt_str_split_str(key, sep);
- src_id = strtol(xbt_dynar_get_as(keys, 0, char *), &end, 10);
- dst_id = strtol(xbt_dynar_get_as(keys, 1, char *), &end, 10);
- route_extended_t e_route =
- generic_new_extended_route(current_routing->hierarchy, data, 0);
- route_new_dijkstra(routing, src_id, dst_id, e_route);
- xbt_dynar_free(&keys);
- }
-
- /* delete the parse table */
- xbt_dict_foreach(routing->parse_routes, cursor, key, data) {
- route = (route_t) data;
- xbt_dynar_free(&(route->link_list));
- xbt_free(data);
- }
-
- /* delete parse dict */
- xbt_dict_free(&(routing->parse_routes));
-
/* Add the loopback if needed */
if (current_routing->hierarchy == SURF_ROUTING_BASE)
add_loopback_dijkstra(routing);
@@ -1913,6 +2186,31 @@ static void model_dijkstra_both_end(void)
}
}
+static void model_dijkstra_both_set_route (routing_component_t rc, const char *src,
+ const char *dst, name_route_extended_t route)
+{
+ routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
+ int *src_id, *dst_id;
+ src_id = xbt_dict_get_or_null(rc->to_index, src);
+ dst_id = xbt_dict_get_or_null(rc->to_index, dst);
+
+ if (routing->cached && !routing->route_cache)
+ routing->route_cache = xbt_dict_new();
+
+ if( A_surfxml_route_symmetrical == A_surfxml_route_symmetrical_YES
+ || A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES )
+ xbt_die("Route symmetrical not supported on model dijkstra");
+
+ if(!route->dst_gateway && !route->src_gateway)
+ DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst);
+ else
+ DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ route->src_gateway, dst, route->dst_gateway);
+
+ route_extended_t e_route =
+ generic_new_extended_route(current_routing->hierarchy, route, 1);
+ route_new_dijkstra(routing, *src_id, *dst_id, e_route);
+}
#ifdef HAVE_PCRE_LIB
/* ************************************************** */
@@ -1951,9 +2249,9 @@ static void rule_route_free(void *e)
xbt_dynar_free(&(*elem)->re_str_link);
pcre_free((*elem)->re_src);
pcre_free((*elem)->re_dst);
- xbt_free((*elem));
+ xbt_free(*elem);
}
- (*elem) = NULL;
+ *elem = NULL;
}
static void rule_route_extended_free(void *e)
@@ -1965,7 +2263,7 @@ static void rule_route_extended_free(void *e)
pcre_free((*elem)->generic_rule_route.re_dst);
xbt_free((*elem)->re_src_gateway);
xbt_free((*elem)->re_dst_gateway);
- xbt_free((*elem));
+ xbt_free(*elem);
}
}
@@ -1990,7 +2288,7 @@ static void model_rulebased_set_autonomous_system(routing_component_t rc,
static void model_rulebased_set_route(routing_component_t rc,
const char *src, const char *dst,
- route_t route)
+ name_route_extended_t route)
{
routing_component_rulebased_t routing =
(routing_component_rulebased_t) rc;
@@ -2005,14 +2303,14 @@ static void model_rulebased_set_route(routing_component_t rc,
xbt_assert3(ruleroute->re_src,
"PCRE compilation failed at offset %d (\"%s\"): %s\n",
erroffset, dst, error);
- ruleroute->re_str_link = route->link_list;
+ ruleroute->re_str_link = route->generic_route.link_list;
xbt_dynar_push(routing->list_route, &ruleroute);
xbt_free(route);
}
static void model_rulebased_set_ASroute(routing_component_t rc,
const char *src, const char *dst,
- route_extended_t route)
+ name_route_extended_t route)
{
routing_component_rulebased_t routing =
(routing_component_rulebased_t) rc;
@@ -2127,9 +2425,45 @@ static char *remplace(char *value, const char **src_list, int src_size,
return xbt_strdup(result_result);
}
+static route_extended_t rulebased_get_route(routing_component_t rc,
+ const char *src,
+ const char *dst);
static xbt_dynar_t rulebased_get_onelink_routes(routing_component_t rc)
{
- xbt_die("\"rulebased_get_onelink_routes\" function not implemented yet");
+ xbt_dynar_t ret = xbt_dynar_new (sizeof(onelink_t), xbt_free);
+ routing_component_rulebased_t routing = (routing_component_rulebased_t)rc;
+
+ xbt_dict_cursor_t c1 = NULL;
+ char *k1, *d1;
+
+ //find router
+ char *router = NULL;
+ xbt_dict_foreach(routing->dict_processing_units, c1, k1, d1) {
+ if (strstr (k1, "router")){
+ router = k1;
+ }
+ }
+ if (!router){
+ xbt_die ("rulebased_get_onelink_routes works only if the AS is a cluster, sorry.");
+ }
+
+ xbt_dict_foreach(routing->dict_processing_units, c1, k1, d1) {
+ route_extended_t route = rulebased_get_route (rc, router, k1);
+
+ int number_of_links = xbt_dynar_length(route->generic_route.link_list);
+ if (number_of_links != 3) {
+ xbt_die ("rulebased_get_onelink_routes works only if the AS is a cluster, sorry.");
+ }
+
+ void *link_ptr;
+ xbt_dynar_get_cpy (route->generic_route.link_list, 2, &link_ptr);
+ onelink_t onelink = xbt_new0 (s_onelink_t, 1);
+ onelink->src = xbt_strdup (k1);
+ onelink->dst = xbt_strdup (router);
+ onelink->link_ptr = link_ptr;
+ xbt_dynar_push (ret, &onelink);
+ }
+ return ret;
}
/* Business methods */
@@ -2273,18 +2607,15 @@ static void *model_rulebased_create(void)
model_rulebased_set_autonomous_system;
new_component->generic_routing.set_route = model_rulebased_set_route;
new_component->generic_routing.set_ASroute = model_rulebased_set_ASroute;
- new_component->generic_routing.set_bypassroute =
- model_rulebased_set_bypassroute;
- new_component->generic_routing.get_onelink_routes =
- rulebased_get_onelink_routes;
+ new_component->generic_routing.set_bypassroute = model_rulebased_set_bypassroute;
+ new_component->generic_routing.get_onelink_routes = rulebased_get_onelink_routes;
new_component->generic_routing.get_route = rulebased_get_route;
- new_component->generic_routing.get_bypass_route = NULL; //rulebased_get_bypass_route;
+ new_component->generic_routing.get_bypass_route = generic_get_bypassroute; //rulebased_get_bypass_route;
new_component->generic_routing.finalize = rulebased_finalize;
/* initialization of internal structures */
new_component->dict_processing_units = xbt_dict_new();
new_component->dict_autonomous_systems = xbt_dict_new();
- new_component->list_route =
- xbt_dynar_new(sizeof(rule_route_t), &rule_route_free);
+ new_component->list_route = xbt_dynar_new(sizeof(rule_route_t), &rule_route_free);
new_component->list_ASroute =
xbt_dynar_new(sizeof(rule_route_extended_t),
&rule_route_extended_free);
@@ -2431,21 +2762,9 @@ static void generic_set_processing_unit(routing_component_t rc,
const char *name)
{
DEBUG1("Load process unit \"%s\"", name);
- model_type_t modeltype = rc->routing;
int *id = xbt_new0(int, 1);
xbt_dict_t _to_index;
- if (modeltype == &routing_models[SURF_MODEL_FULL])
- _to_index = ((routing_component_full_t) rc)->to_index;
-
- else if (modeltype == &routing_models[SURF_MODEL_FLOYD])
- _to_index = ((routing_component_floyd_t) rc)->to_index;
-
- else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE])
- _to_index = ((routing_component_dijkstra_t) rc)->to_index;
-
- else
- xbt_die("\"generic_set_processing_unit\" not supported");
+ _to_index = current_routing->to_index;
*id = xbt_dict_length(_to_index);
xbt_dict_set(_to_index, name, id, xbt_free);
}
@@ -2454,112 +2773,21 @@ static void generic_set_autonomous_system(routing_component_t rc,
const char *name)
{
DEBUG1("Load Autonomous system \"%s\"", name);
- model_type_t modeltype = rc->routing;
int *id = xbt_new0(int, 1);
xbt_dict_t _to_index;
- if (modeltype == &routing_models[SURF_MODEL_FULL])
- _to_index = ((routing_component_full_t) rc)->to_index;
-
- else if (modeltype == &routing_models[SURF_MODEL_FLOYD])
- _to_index = ((routing_component_floyd_t) rc)->to_index;
-
- else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE])
- _to_index = ((routing_component_dijkstra_t) rc)->to_index;
-
- else
- xbt_die("\"generic_set_autonomous_system\" not supported");
+ _to_index = current_routing->to_index;
*id = xbt_dict_length(_to_index);
xbt_dict_set(_to_index, name, id, xbt_free);
}
-static void generic_set_route(routing_component_t rc, const char *src,
- const char *dst, route_t route)
+static int surf_pointer_resource_cmp(const void *a, const void *b)
{
- DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst);
- model_type_t modeltype = rc->routing;
- xbt_dict_t _parse_routes;
- xbt_dict_t _to_index;
- char *route_name;
- int *src_id, *dst_id;
-
- if (modeltype == &routing_models[SURF_MODEL_FULL]) {
- _parse_routes = ((routing_component_full_t) rc)->parse_routes;
- _to_index = ((routing_component_full_t) rc)->to_index;
-
- } else if (modeltype == &routing_models[SURF_MODEL_FLOYD]) {
- _parse_routes = ((routing_component_floyd_t) rc)->parse_routes;
- _to_index = ((routing_component_floyd_t) rc)->to_index;
-
- } else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE]) {
- _parse_routes = ((routing_component_dijkstra_t) rc)->parse_routes;
- _to_index = ((routing_component_dijkstra_t) rc)->to_index;
-
- } else
- xbt_die("\"generic_set_route\" not supported");
-
- src_id = xbt_dict_get_or_null(_to_index, src);
- dst_id = xbt_dict_get_or_null(_to_index, dst);
-
- xbt_assert2(src_id
- && dst_id, "Network elements %s or %s not found", src, dst);
- route_name = bprintf("%d#%d", *src_id, *dst_id);
-
- xbt_assert2(xbt_dynar_length(route->link_list) > 0,
- "Invalid count of links, must be greater than zero (%s,%s)",
- src, dst);
- xbt_assert2(!xbt_dict_get_or_null(_parse_routes, route_name),
- "The route between \"%s\" and \"%s\" already exist", src,
- dst);
-
- xbt_dict_set(_parse_routes, route_name, route, NULL);
- xbt_free(route_name);
+ return a != b;
}
-static void generic_set_ASroute(routing_component_t rc, const char *src,
- const char *dst, route_extended_t e_route)
+static int surf_link_resource_cmp(const void *a, const void *b)
{
- DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
- e_route->src_gateway, dst, e_route->dst_gateway);
- model_type_t modeltype = rc->routing;
- xbt_dict_t _parse_routes;
- xbt_dict_t _to_index;
- char *route_name;
- int *src_id, *dst_id;
-
- if (modeltype == &routing_models[SURF_MODEL_FULL]) {
- _parse_routes = ((routing_component_full_t) rc)->parse_routes;
- _to_index = ((routing_component_full_t) rc)->to_index;
-
- } else if (modeltype == &routing_models[SURF_MODEL_FLOYD]) {
- _parse_routes = ((routing_component_floyd_t) rc)->parse_routes;
- _to_index = ((routing_component_floyd_t) rc)->to_index;
-
- } else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE]) {
- _parse_routes = ((routing_component_dijkstra_t) rc)->parse_routes;
- _to_index = ((routing_component_dijkstra_t) rc)->to_index;
-
- } else
- xbt_die("\"generic_set_route\" not supported");
-
- src_id = xbt_dict_get_or_null(_to_index, src);
- dst_id = xbt_dict_get_or_null(_to_index, dst);
-
- xbt_assert2(src_id
- && dst_id, "Network elements %s or %s not found", src, dst);
- route_name = bprintf("%d#%d", *src_id, *dst_id);
-
- xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list) > 0,
- "Invalid count of links, must be greater than zero (%s,%s)",
- src, dst);
- xbt_assert4(!xbt_dict_get_or_null(_parse_routes, route_name),
- "The route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",
- src, e_route->src_gateway, dst, e_route->dst_gateway);
-
- xbt_dict_set(_parse_routes, route_name, e_route, NULL);
- xbt_free(route_name);
+ return !!memcmp(a,b,global_routing->size_of_link);
}
static void generic_set_bypassroute(routing_component_t rc,
@@ -2567,24 +2795,15 @@ static void generic_set_bypassroute(routing_component_t rc,
route_extended_t e_route)
{
DEBUG2("Load bypassRoute from \"%s\" to \"%s\"", src, dst);
- model_type_t modeltype = rc->routing;
- xbt_dict_t dict_bypassRoutes;
+ xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
char *route_name;
- if (modeltype == &routing_models[SURF_MODEL_FULL]) {
- dict_bypassRoutes = ((routing_component_full_t) rc)->bypassRoutes;
- } else if (modeltype == &routing_models[SURF_MODEL_FLOYD]) {
- dict_bypassRoutes = ((routing_component_floyd_t) rc)->bypassRoutes;
- } else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE]) {
- dict_bypassRoutes = ((routing_component_dijkstra_t) rc)->bypassRoutes;
- } else
- xbt_die("\"generic_set_bypassroute\" not supported");
+
route_name = bprintf("%s#%s", src, dst);
xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list) > 0,
"Invalid count of links, must be greater than zero (%s,%s)",
src, dst);
xbt_assert4(!xbt_dict_get_or_null(dict_bypassRoutes, route_name),
- "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exist",
+ "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
src, e_route->src_gateway, dst, e_route->dst_gateway);
route_extended_t new_e_route =
@@ -2600,6 +2819,20 @@ static void generic_set_bypassroute(routing_component_t rc,
/* ************************************************************************** */
/* *********************** GENERIC BUSINESS METHODS ************************* */
+static double generic_get_link_latency(routing_component_t rc,
+ const char *src, const char *dst)
+{
+ route_extended_t route = rc->get_route(rc,src,dst);
+ void * link;
+ unsigned int i;
+ double latency = 0.0;
+
+ xbt_dynar_foreach(route->generic_route.link_list,i,link) {
+ latency += get_link_latency(link);
+ }
+ return latency;
+}
+
static xbt_dynar_t generic_get_onelink_routes(routing_component_t rc)
{
xbt_die("\"generic_get_onelink_routes\" not implemented yet");
@@ -2609,20 +2842,7 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc,
const char *src,
const char *dst)
{
- model_type_t modeltype = rc->routing;
- xbt_dict_t dict_bypassRoutes;
-
- if (modeltype == &routing_models[SURF_MODEL_FULL]) {
- dict_bypassRoutes = ((routing_component_full_t) rc)->bypassRoutes;
- } else if (modeltype == &routing_models[SURF_MODEL_FLOYD]) {
- dict_bypassRoutes = ((routing_component_floyd_t) rc)->bypassRoutes;
- } else if (modeltype == &routing_models[SURF_MODEL_DIJKSTRA] ||
- modeltype == &routing_models[SURF_MODEL_DIJKSTRACACHE]) {
- dict_bypassRoutes = ((routing_component_dijkstra_t) rc)->bypassRoutes;
- } else
- xbt_die("\"generic_get_bypassroute\" not supported");
-
-
+ xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
routing_component_t src_as, dst_as;
int index_src, index_dst;
xbt_dynar_t path_src = NULL;
@@ -2658,8 +2878,8 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc,
}
/* (3) find the common father */
- index_src = (path_src->used) - 1;
- index_dst = (path_dst->used) - 1;
+ index_src = path_src->used - 1;
+ index_dst = path_dst->used - 1;
current_src = xbt_dynar_get_ptr(path_src, index_src);
current_dst = xbt_dynar_get_ptr(path_dst, index_dst);
while (index_src >= 0 && index_dst >= 0 && *current_src == *current_dst) {
@@ -2672,8 +2892,8 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc,
current_dst = xbt_dynar_get_ptr(path_dst, index_dst);
}
- int max_index_src = (path_src->used) - 1;
- int max_index_dst = (path_dst->used) - 1;
+ int max_index_src = path_src->used - 1;
+ int max_index_dst = path_dst->used - 1;
int max_index = max(max_index_src, max_index_dst);
int i, max;
@@ -2754,6 +2974,44 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc,
/* ************************************************************************** */
/* ************************* GENERIC AUX FUNCTIONS ************************** */
+static route_t
+generic_new_route(e_surf_routing_hierarchy_t hierarchy,
+ void *data, int order)
+{
+
+ char *link_name;
+ route_t new_route;
+ unsigned int cpt;
+ xbt_dynar_t links = NULL, links_id = NULL;
+
+ new_route = xbt_new0(s_route_t, 1);
+ new_route->link_list =
+ xbt_dynar_new(global_routing->size_of_link, NULL);
+
+ xbt_assert0(hierarchy == SURF_ROUTING_BASE,
+ "the hierarchy type is not SURF_ROUTING_BASE");
+
+ links = ((route_t) data)->link_list;
+
+
+ links_id = new_route->link_list;
+
+ xbt_dynar_foreach(links, cpt, link_name) {
+
+ void *link =
+ xbt_dict_get_or_null(surf_network_model->resource_set, link_name);
+ if (link) {
+ if (order)
+ xbt_dynar_push(links_id, &link);
+ else
+ xbt_dynar_unshift(links_id, &link);
+ } else
+ THROW1(mismatch_error, 0, "Link %s not found", link_name);
+ }
+
+ return new_route;
+}
+
static route_extended_t
generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
void *data, int order)
@@ -2763,7 +3021,7 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy,
route_extended_t e_route, new_e_route;
route_t route;
unsigned int cpt;
- xbt_dynar_t links, links_id;
+ xbt_dynar_t links = NULL, links_id = NULL;
new_e_route = xbt_new0(s_route_extended_t, 1);
new_e_route->generic_route.link_list =
@@ -2914,13 +3172,25 @@ static void generic_src_dst_check(routing_component_t rc, const char *src,
rc->name, dst_as->name);
}
-static void parse_Sconfig(void)
+static void routing_parse_Sconfig(void)
{
//TODO
DEBUG0("WARNING tag config not yet implemented.");
+ DEBUG1("Configuration name = %s",A_surfxml_config_id);
}
-static void routing_full_parse_Scluster(void)
+static void routing_parse_Econfig(void)
+{
+ //TODO
+ xbt_dict_cursor_t cursor = NULL;
+ char *key;
+ char *elem;
+ xbt_dict_foreach(current_property_set, cursor, key, elem) {
+ DEBUG2("property : %s = %s",key,elem);
+ }
+}
+
+static void routing_parse_Scluster(void)
{
static int AX_ptr = 0;
@@ -2933,12 +3203,18 @@ static void routing_full_parse_Scluster(void)
char *cluster_lat = A_surfxml_cluster_lat;
char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
- char *host_id, *groups, *link_id;
- char *router_id, *link_router, *link_backbone, *route_src_dst;
+ char *host_id, *groups, *link_id = NULL;
+ char *router_id, *link_router, *link_backbone;
+#ifdef HAVE_PCRE_LIB
+ char *route_src_dst;
+#endif
unsigned int iter;
int start, end, i;
xbt_dynar_t radical_elements;
xbt_dynar_t radical_ends;
+ int cluster_sharing_policy = AX_surfxml_cluster_sharing_policy;
+ int cluster_bb_sharing_policy = AX_surfxml_cluster_bb_sharing_policy;
+
#ifndef HAVE_PCRE_LIB
xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
char *route_src, *route_dst;
@@ -2976,28 +3252,33 @@ static void routing_full_parse_Scluster(void)
link_id = bprintf("%s_link_%d", cluster_id, start);
DEBUG2("", host_id, cluster_power);
+ A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_id, host_id);
SURFXML_BUFFER_SET(host_power, cluster_power);
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_availability_file, "");
- A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_state_file, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
- DEBUG3("", link_id,
- cluster_bw, cluster_lat);
+ DEBUG3("", link_id,cluster_bw, cluster_lat);
+ A_surfxml_link_state = A_surfxml_link_state_ON;
+ A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_id);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+ free(link_id);
+ free(host_id);
break;
case 2:
@@ -3014,28 +3295,33 @@ static void routing_full_parse_Scluster(void)
link_id = bprintf("%s_link_%d", cluster_id, i);
DEBUG2("", host_id, cluster_power);
+ A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_id, host_id);
SURFXML_BUFFER_SET(host_power, cluster_power);
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_availability_file, "");
- A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_state_file, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
- DEBUG3("", link_id,
- cluster_bw, cluster_lat);
+ DEBUG3("", link_id,cluster_bw, cluster_lat);
+ A_surfxml_link_state = A_surfxml_link_state_ON;
+ A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_id);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy =
- A_surfxml_link_sharing_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+
+ free(link_id);
+ free(host_id);
}
break;
@@ -3045,6 +3331,7 @@ static void routing_full_parse_Scluster(void)
xbt_dynar_free(&radical_ends);
}
+ xbt_dynar_free(&radical_elements);
DEBUG0(" ");
router_id =
@@ -3058,68 +3345,93 @@ static void routing_full_parse_Scluster(void)
SURFXML_START_TAG(router);
SURFXML_END_TAG(router);
- DEBUG3("", link_router,
- cluster_bw, cluster_lat);
+ DEBUG3("", link_router,cluster_bw, cluster_lat);
+ A_surfxml_link_state = A_surfxml_link_state_ON;
+ A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_router);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bw);
SURFXML_BUFFER_SET(link_latency, cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG3("", link_backbone,
- cluster_bb_bw, cluster_bb_lat);
+ DEBUG3("", link_backbone,cluster_bw, cluster_lat);
+ A_surfxml_link_state = A_surfxml_link_state_ON;
+ A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
+ if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE)
+ {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_backbone);
SURFXML_BUFFER_SET(link_bandwidth, cluster_bb_bw);
SURFXML_BUFFER_SET(link_latency, cluster_bb_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
- A_surfxml_link_state = A_surfxml_link_state_ON;
SURFXML_BUFFER_SET(link_state_file, "");
- A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- char *new_suffix = bprintf("%s", "");
+ DEBUG0(" ");
+
+#ifdef HAVE_PCRE_LIB
+ char *new_suffix = xbt_strdup("");
radical_elements = xbt_str_split(cluster_suffix, ".");
xbt_dynar_foreach(radical_elements, iter, groups) {
if (strcmp(groups, "")) {
- new_suffix = bprintf("%s\\.%s", new_suffix, groups);
+ char *old_suffix = new_suffix;
+ new_suffix = bprintf("%s\\.%s", old_suffix, groups);
+ free(old_suffix);
}
}
route_src_dst = bprintf("%s(.*)%s", cluster_prefix, new_suffix);
+ xbt_dynar_free(&radical_elements);
+ free(new_suffix);
- DEBUG0(" ");
+ char *pcre_link_src = bprintf("%s_link_$1src", cluster_id);
+ char *pcre_link_backbone = bprintf("%s_backbone", cluster_id);
+ char *pcre_link_dst = bprintf("%s_link_$1dst", cluster_id);
-#ifdef HAVE_PCRE_LIB
-
- DEBUG2("", route_src_dst, route_src_dst);
+ DEBUG2("");
SURFXML_BUFFER_SET(route_src, route_src_dst);
SURFXML_BUFFER_SET(route_dst, route_src_dst);
+ A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
SURFXML_START_TAG(route);
- DEBUG1("", cluster_id);
- SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1src", cluster_id));
+ DEBUG1("", pcre_link_src);
+ SURFXML_BUFFER_SET(link_ctn_id, pcre_link_src);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+ {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG1("", cluster_id);
- SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id));
+ DEBUG1("", pcre_link_backbone);
+ SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG1("", cluster_id);
- SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_link_$1dst", cluster_id));
+ DEBUG1("", pcre_link_dst);
+ SURFXML_BUFFER_SET(link_ctn_id, pcre_link_dst);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+ {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
DEBUG0("");
SURFXML_END_TAG(route);
+
+ free(pcre_link_dst);
+ free(pcre_link_backbone);
+ free(pcre_link_src);
+ free(route_src_dst);
#else
for (i = 0; i <= xbt_dynar_length(tab_elements_num); i++) {
for (j = 0; j <= xbt_dynar_length(tab_elements_num); j++) {
@@ -3141,9 +3453,11 @@ static void routing_full_parse_Scluster(void)
cluster_suffix);
}
- DEBUG2("", route_src, route_dst);
+ DEBUG2("");
SURFXML_BUFFER_SET(route_src, route_src);
SURFXML_BUFFER_SET(route_dst, route_dst);
+ A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
SURFXML_START_TAG(route);
if (i == xbt_dynar_length(tab_elements_num)) {
@@ -3162,18 +3476,25 @@ static void routing_full_parse_Scluster(void)
xbt_dynar_get_as(tab_elements_num, j, int));
}
- DEBUG1("", route_src);
+ DEBUG1("", route_src);
SURFXML_BUFFER_SET(link_ctn_id, route_src);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+ {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG1("", cluster_id);
+ DEBUG1("", cluster_id);
SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id));
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG1("", route_dst);
+ DEBUG1("", route_dst);
SURFXML_BUFFER_SET(link_ctn_id, route_dst);
+ A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
+ if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
+ {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
@@ -3182,8 +3503,13 @@ static void routing_full_parse_Scluster(void)
}
}
xbt_dynar_free(&tab_elements_num);
+ free(router_id);
+
#endif
+ free(link_backbone);
+ free(link_router);
+
DEBUG0("");
SURFXML_END_TAG(AS);
DEBUG0(" ");
@@ -3233,7 +3559,7 @@ void routing_add_link(const char *link_id)
*/
void routing_set_route(const char *src_id, const char *dst_id)
{
- parse_S_route_new_and_endpoints_lua((char *) src_id, (char *) dst_id);
+ parse_S_route_new_and_endpoints_lua(src_id, dst_id);
}
/*