#include "xbt/set.h"
#include "surf/surfxml_parse.h"
+xbt_dict_t patterns = NULL;
+xbt_dict_t random_value = NULL;
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
/* Global vars */
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 */
static void routing_parse_Sconfig(void); /*config Tag */
static void routing_parse_Econfig(void); /*config Tag */
+static char* replace_random_parameter(char * chaine);
+static void clean_dict_random(void);
+
/* this lines are only for replace use like index in the model table */
typedef enum {
SURF_MODEL_FULL = 0,
network_element_info_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_BASE;
- xbt_assert1(!xbt_dict_get_or_null
- (global_routing->where_network_elements, host_id),
+ xbt_assert1(!xbt_lib_get_or_null(host_lib, host_id,ROUTING_HOST_LEVEL),
"Reading a host, processing unit \"%s\" already exists",
host_id);
xbt_assert1(current_routing->set_processing_unit,
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_HOST;
- xbt_dict_set(global_routing->where_network_elements, host_id,
- (void *) info, xbt_free);
-
+ xbt_lib_set(host_lib,host_id,ROUTING_HOST_LEVEL,(void *) info);
if (strcmp(coord,"")) {
- xbt_dynar_t ctn = xbt_str_split_str(coord, " ");
- xbt_dynar_shrink(ctn,0);
- xbt_dict_set (coordinates,host_id,ctn,NULL);
+ xbt_dynar_t ctn = xbt_str_split_str(coord, " ");
+ xbt_dynar_shrink(ctn, 0);
+ xbt_dict_set(coordinates, host_id, ctn, xbt_dynar_free_voidp);
}
}
char *elem;
xbt_dict_foreach(current_property_set, cursor, key, elem) {
- DEBUG2("property : %s = %s",key,elem);
+ XBT_DEBUG("property : %s = %s",key,elem);
}
}
/**
* \brief Add a "router" to the network element list
*/
-static void parse_S_router(void)
+static void parse_S_router(const char *router_id)
{
network_element_info_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_BASE;
- xbt_assert1(!xbt_dict_get_or_null
- (global_routing->where_network_elements,
- A_surfxml_router_id),
+ xbt_assert1(!xbt_lib_get_or_null(as_router_lib,A_surfxml_router_id, ROUTING_ASR_LEVEL),
"Reading a router, processing unit \"%s\" already exists",
- A_surfxml_router_id);
+ router_id);
xbt_assert1(current_routing->set_processing_unit,
"no defined method \"set_processing_unit\" in \"%s\"",
current_routing->name);
(*(current_routing->set_processing_unit)) (current_routing,
- A_surfxml_router_id);
+ router_id);
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_ROUTER;
- xbt_dict_set(global_routing->where_network_elements, A_surfxml_router_id,
- (void *) info, xbt_free);
+
+ xbt_lib_set(as_router_lib,router_id,ROUTING_ASR_LEVEL,(void *) info);
if (strcmp(A_surfxml_router_coordinates,"")) {
- xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " ");
- xbt_dynar_shrink(ctn,0);
- xbt_dict_set (coordinates,A_surfxml_router_id,ctn,NULL);
+ xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " ");
+ xbt_dynar_shrink(ctn, 0);
+ xbt_lib_set(as_router_lib,router_id,COORD_ASR_LEVEL,(void *) ctn);
}
}
+/**
+ * brief Add a "router" to the network element list from XML description
+ */
+static void parse_S_router_XML(void)
+{
+ return parse_S_router(A_surfxml_router_id);
+}
+
+/**
+ * brief Add a "router" to the network element list from XML description
+ */
+static void parse_S_router_lua(const char* router_id)
+{
+ return parse_S_router(router_id);
+}
+
/**
* \brief Set the endponints for a route
*/
parse_S_AS(A_surfxml_AS_id, A_surfxml_AS_routing);
if (strcmp(A_surfxml_AS_coordinates,"")) {
- DEBUG2("%s coordinates : %s",A_surfxml_AS_id,A_surfxml_AS_coordinates);
- xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_AS_coordinates, " ");
- xbt_dynar_shrink(ctn,0);
- xbt_dict_set (coordinates,A_surfxml_AS_id,ctn,NULL);
+ XBT_DEBUG("%s coordinates : %s", A_surfxml_AS_id, A_surfxml_AS_coordinates);
+ xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_AS_coordinates, " ");
+ xbt_dynar_shrink(ctn, 0);
+ xbt_dict_set(coordinates, A_surfxml_AS_id, ctn, xbt_dynar_free_voidp);
}
}
THROW1(arg_error, 0, "Close AS(%s), that never open", AS_id);
} else {
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 exists",
- current_routing->name);
+ xbt_assert1(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL),
+ "The AS \"%s\" already exists",current_routing->name);
info = xbt_new0(s_network_element_info_t, 1);
info->rc_component = current_routing->routing_father;
info->rc_type = SURF_NETWORK_ELEMENT_AS;
- xbt_dict_set(global_routing->where_network_elements,
- current_routing->name, info, xbt_free);
+ xbt_lib_set(as_router_lib,current_routing->name,ROUTING_ASR_LEVEL,(void *) info);
+
(*(current_routing->routing->unload)) ();
(*(current_routing->routing->end)) ();
current_routing = current_routing->routing_father;
/* (1) find the as where the host is located */
as_comp = ((network_element_info_t)
- xbt_dict_get_or_null(global_routing->where_network_elements,
- name))->rc_component;
+ xbt_lib_get_or_null(host_lib,name, ROUTING_HOST_LEVEL))->rc_component;
return as_comp->name;
}
routing_component_t *father = NULL;
/* (1) find the as where the src and dst are located */
- src_as = ((network_element_info_t)
- xbt_dict_get_or_null(global_routing->where_network_elements,
- src))->rc_component;
- dst_as = ((network_element_info_t)
- xbt_dict_get_or_null(global_routing->where_network_elements,
- dst))->rc_component;
+ void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL);
+ void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL);
+ if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL);
+ if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL);
+ src_as = ((network_element_info_t)src_data)->rc_component;
+ dst_as = ((network_element_info_t)dst_data)->rc_component;
+
xbt_assert2(src_as
&& dst_as,
"Ask for route \"from\"(%s) or \"to\"(%s) no found", src,
void *link;
unsigned int cpt = 0;
- DEBUG2("Solve route \"%s\" to \"%s\"", src, dst);
+ XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst);
xbt_assert0(src && dst, "bad parameters for \"_get_route\" method");
{
double latency, latency_src, latency_dst = 0.0;
- DEBUG2("Solve route \"%s\" to \"%s\"", src, dst);
+ XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst);
xbt_assert0(src && dst, "bad parameters for \"_get_route\" method");
route_extended_t e_route_cnt;
{
/* delete recursibly all the tree */
_finalize(global_routing->root);
- /* delete "where" dict */
- xbt_dict_free(&(global_routing->where_network_elements));
xbt_dict_free(&(coordinates));
/* delete last_route */
xbt_dynar_free(&(global_routing->last_route));
return recursive_get_onelink_routes(global_routing->root);
}
-static e_surf_network_element_type_t get_network_element_type(const char
+e_surf_network_element_type_t get_network_element_type(const char
*name)
{
network_element_info_t rc = NULL;
- rc = xbt_dict_get(global_routing->where_network_elements, name);
- return rc->rc_type;
+
+ rc = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL);
+ if(rc) return rc->rc_type;
+
+ rc = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL);
+ if(rc) return rc->rc_type;
+
+ return SURF_NETWORK_ELEMENT_NULL;
}
/**
{
/* config the uniq global routing */
global_routing = xbt_new0(s_routing_global_t, 1);
- global_routing->where_network_elements = xbt_dict_new();
global_routing->root = NULL;
global_routing->get_route = get_route;
global_routing->get_latency = get_latency;
/* parse generic elements */
surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML);
surfxml_add_callback(ETag_surfxml_host_cb_list, &parse_E_host_XML);
- surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router);
+ surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router_XML);
surfxml_add_callback(STag_surfxml_route_cb_list,
&parse_S_route_new_and_endpoints_XML);
surfxml_add_callback(STag_surfxml_peer_cb_list,
&routing_parse_Speer);
+ surfxml_add_callback(ETag_surfxml_platform_cb_list,
+ &clean_dict_random);
+
#ifdef HAVE_TRACING
instr_routing_define_callbacks();
#endif
surfxml_add_callback(ETag_surfxml_config_cb_list, &routing_parse_Econfig);
surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties);
surfxml_add_callback(STag_surfxml_AS_cb_list, &surf_parse_models_setup);
+ surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom);
}
void surf_parse_models_setup()
{
+ routing_parse_Erandom();
surfxml_del_callback(STag_surfxml_AS_cb_list, surf_parse_models_setup);
surf_config_models_setup(platform_filename);
free(platform_filename);
(void*)link_route_to_test,
(int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp),
"The route between \"%s\" and \"%s\" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.", src,dst);
- xbt_dynar_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,
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
+ else{
+ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->src_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);
}
(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_dynar_free(&link_route_to_test);
}
else
{
if(!route->dst_gateway && !route->src_gateway)
- DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src);
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
else
- DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ XBT_DEBUG("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);
if(TO_FLOYD_LINK(*src_id, *dst_id))
{
if(!route->dst_gateway && !route->src_gateway)
- DEBUG2("See Route from \"%s\" to \"%s\"", src, dst);
+ XBT_DEBUG("See Route from \"%s\" to \"%s\"", src, dst);
else
- DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
char * link_name;
unsigned int cpt;
(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,
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
+ else{
+ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
-
+ if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->src_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;
if(TO_FLOYD_LINK(*dst_id, *src_id))
{
if(!route->dst_gateway && !route->src_gateway)
- DEBUG2("See Route from \"%s\" to \"%s\"", dst, src);
+ XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src);
else
- DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
route->src_gateway, src, route->dst_gateway);
char * link_name;
unsigned int i;
(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);
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src);
else
- DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
+ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst,
route->src_gateway, src, route->dst_gateway);
TO_FLOYD_LINK(*dst_id, *src_id) =
int dst_id, route_extended_t e_route)
{
routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc;
- DEBUG2("Load Route from \"%d\" to \"%d\"", src_id, dst_id);
+ XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id);
xbt_node_t src = NULL;
xbt_node_t dst = NULL;
new_component->generic_routing.set_autonomous_system =
generic_set_autonomous_system;
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_ASroute = model_dijkstra_both_set_route;
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;
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,
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
+ else{
+ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
+ }
route_extended_t e_route =
generic_new_extended_route(current_routing->hierarchy, route, 1);
param_list = dst_list;
param_size = dst_size;
} else {
- xbt_assert2(0,
- "bad string parameter, support only \"src\" and \"dst\", at offset: %d (\"%s\")",
- i, value);
+ xbt_die("bad string parameter, support only \"src\" and \"dst\", "
+ "at offset: %d (\"%s\")", i, value);
}
i = i + 3;
routing_component_rulebased_t routing =
(routing_component_rulebased_t) rc;
- int are_processing_units;
+ int are_processing_units=0;
xbt_dynar_t rule_list;
if (xbt_dict_get_or_null(routing->dict_processing_units, src)
&& xbt_dict_get_or_null(routing->dict_processing_units, dst)) {
are_processing_units = 0;
rule_list = routing->list_ASroute;
} else
- xbt_assert2(NULL,
- "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
- src, dst);
+ xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found in "
+ "the local table", src, dst);
int rc_src = -1;
int rc_dst = -1;
int ovector_dst[OVECCOUNT];
const char **list_src = NULL;
const char **list_dst = NULL;
+ int res;
xbt_dynar_foreach(rule_list, cpt, ruleroute) {
rc_src =
pcre_exec(ruleroute->re_src, NULL, src, src_length, 0, 0,
pcre_exec(ruleroute->re_dst, NULL, dst, dst_length, 0, 0,
ovector_dst, OVECCOUNT);
if (rc_dst >= 0) {
- xbt_assert1(!pcre_get_substring_list
- (src, ovector_src, rc_src, &list_src),
- "error solving substring list for src \"%s\"", src);
- xbt_assert1(!pcre_get_substring_list
- (dst, ovector_dst, rc_dst, &list_dst),
- "error solving substring list for src \"%s\"", dst);
+ res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src);
+ xbt_assert1(!res, "error solving substring list for src \"%s\"", src);
+ res = pcre_get_substring_list(dst, ovector_dst, rc_dst, &list_dst);
+ xbt_assert1(!res, "error solving substring list for src \"%s\"", dst);
char *link_name;
xbt_dynar_foreach(ruleroute->re_str_link, cpt, link_name) {
char *new_link_name =
static void generic_set_processing_unit(routing_component_t rc,
const char *name)
{
- DEBUG1("Load process unit \"%s\"", name);
+ XBT_DEBUG("Load process unit \"%s\"", name);
int *id = xbt_new0(int, 1);
xbt_dict_t _to_index;
_to_index = current_routing->to_index;
static void generic_set_autonomous_system(routing_component_t rc,
const char *name)
{
- DEBUG1("Load Autonomous system \"%s\"", name);
+ XBT_DEBUG("Load Autonomous system \"%s\"", name);
int *id = xbt_new0(int, 1);
xbt_dict_t _to_index;
_to_index = current_routing->to_index;
const char *src, const char *dst,
route_extended_t e_route)
{
- DEBUG2("Load bypassRoute from \"%s\" to \"%s\"", src, dst);
+ XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst);
xbt_dict_t dict_bypassRoutes = rc->bypassRoutes;
char *route_name;
/* (1) find the as where the src and dst are located */
src_as = ((network_element_info_t)
- xbt_dict_get_or_null(global_routing->where_network_elements,
- src))->rc_component;
+ xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL))->rc_component;
dst_as = ((network_element_info_t)
- xbt_dict_get_or_null(global_routing->where_network_elements,
- dst))->rc_component;
+ xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL))->rc_component;
xbt_assert2(src_as
&& dst_as,
"Ask for route \"from\"(%s) or \"to\"(%s) no found", src,
xbt_dict_cursor_t cursor = NULL;
char *key;
element_as = ((network_element_info_t)
- xbt_dict_get_or_null
- (global_routing->where_network_elements,
- element))->rc_component;
+ xbt_lib_get_or_null(as_router_lib, element, ROUTING_ASR_LEVEL))->rc_component;
result = ((routing_component_t) - 1);
if (element_as != rc)
result = generic_as_exist(rc, element_as);
{
routing_component_t element_as;
element_as = ((network_element_info_t)
- xbt_dict_get_or_null
- (global_routing->where_network_elements,
- element))->rc_component;
+ xbt_lib_get_or_null(host_lib,
+ element, ROUTING_HOST_LEVEL))->rc_component;
if (element_as == rc)
return element_as;
return generic_as_exist(rc, element_as);
const char *dst)
{
- routing_component_t src_as = ((network_element_info_t)
- xbt_dict_get_or_null
- (global_routing->where_network_elements,
- src))->rc_component;
- routing_component_t dst_as = ((network_element_info_t)
- xbt_dict_get_or_null
- (global_routing->where_network_elements,
- dst))->rc_component;
-
- xbt_assert3(src_as != NULL && dst_as != NULL,
- "Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
- src, dst, rc->name);
- xbt_assert4(src_as == dst_as,
- "The src(%s in %s) and dst(%s in %s) are in differents AS",
+ void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL);
+ void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL);
+ if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL);
+ if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL);
+
+ if(src_data == NULL || dst_data == NULL)
+ xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
+ src, dst, rc->name);
+
+ routing_component_t src_as = ((network_element_info_t)src_data)->rc_component;
+ routing_component_t dst_as = ((network_element_info_t)dst_data)->rc_component;
+
+ if(src_as != dst_as)
+ xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS",
src, src_as->name, dst, dst_as->name);
- xbt_assert2(rc == dst_as,
- "The routing component of src and dst is not the same as the network elements belong (%s==%s)",
- rc->name, dst_as->name);
+ if(rc != dst_as)
+ xbt_die("The routing component of src and dst is not the same as the network elements belong (%s==%s)",
+ rc->name, dst_as->name);
}
static void routing_parse_Sconfig(void)
{
- DEBUG1("START configuration name = %s",A_surfxml_config_id);
+ XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
}
static void routing_parse_Econfig(void)
if(xbt_cfg_is_default_value(_surf_cfg_set, key))
xbt_cfg_set_parse(_surf_cfg_set, cfg);
else
- INFO1("The custom configuration '%s' is already define by user!",key);
- }
- DEBUG1("End configuration name = %s",A_surfxml_config_id);
+ XBT_INFO("The custom configuration '%s' is already define by user!",key);
+ free(cfg);
+ }
+ XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
}
static void routing_parse_Scluster(void)
char *cluster_core = A_surfxml_cluster_core;
char *cluster_bw = A_surfxml_cluster_bw;
char *cluster_lat = A_surfxml_cluster_lat;
+ char *temp_cluster_bw = NULL;
+ char *temp_cluster_lat = NULL;
+ char *temp_cluster_power = NULL;
char *cluster_bb_bw = A_surfxml_cluster_bb_bw;
char *cluster_bb_lat = A_surfxml_cluster_bb_lat;
char *cluster_availability_file = A_surfxml_cluster_availability_file;
char *availability_file = bprintf("%s",cluster_availability_file);
char *state_file = bprintf("%s",cluster_state_file);
- xbt_dict_t patterns = xbt_dict_new();
+ if(xbt_dict_size(patterns)==0)
+ patterns = xbt_dict_new();
+
xbt_dict_set(patterns,"id",cluster_id,NULL);
xbt_dict_set(patterns,"prefix",cluster_prefix,NULL);
xbt_dict_set(patterns,"suffix",cluster_suffix,NULL);
-
#ifdef HAVE_PCRE_LIB
char *route_src_dst;
#endif
SURFXML_BUFFER_SET(AS_id, cluster_id);
#ifdef HAVE_PCRE_LIB
SURFXML_BUFFER_SET(AS_routing, "RuleBased");
-
DEBUG1("<AS id=\"%s\"\trouting=\"RuleBased\">", cluster_id);
+
XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", cluster_id);
#else
SURFXML_BUFFER_SET(AS_routing, "Full");
-
DEBUG1("<AS id=\"%s\"\trouting=\"Full\">", cluster_id);
+
XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", cluster_id);
#endif
SURFXML_START_TAG(AS);
#endif
link_id = bprintf("%s_link_%d", cluster_id, start);
- DEBUG2("<host\tid=\"%s\"\tpower=\"%s\">", host_id, cluster_power);
+ xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free);
+ temp_cluster_power = bprintf("%s",cluster_power);
+ temp_cluster_power = replace_random_parameter(temp_cluster_power);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, temp_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_power, temp_cluster_power);
SURFXML_BUFFER_SET(host_core, cluster_core);
SURFXML_BUFFER_SET(host_availability, "1.0");
- xbt_dict_set(patterns,"radical",bprintf("%d",start),NULL);
- availability_file = bprintf("%s",cluster_availability_file);
- state_file = bprintf("%s",cluster_state_file);
- DEBUG1("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
- DEBUG1("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns));
- SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns));
- SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
- DEBUG0("</host>");
+ SURFXML_BUFFER_SET(host_coordinates, "");
+ xbt_free(availability_file);
+ availability_file = bprintf("%s",cluster_availability_file);
+ xbt_free(state_file);
+ state_file = bprintf("%s",cluster_state_file);
+ XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
+ XBT_DEBUG("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns));
+ SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns));
+ SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
+ XBT_DEBUG("</host>");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
- DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,cluster_bw, cluster_lat);
+
+ temp_cluster_bw = bprintf("%s",cluster_bw);
+ temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
+ temp_cluster_lat = bprintf("%s",cluster_lat);
+ temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,temp_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)
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, temp_cluster_bw);
+ SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
SURFXML_BUFFER_SET(link_state_file, "");
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+ xbt_free(temp_cluster_bw);
+ xbt_free(temp_cluster_lat);
+ xbt_free(temp_cluster_power);
free(link_id);
free(host_id);
break;
#endif
link_id = bprintf("%s_link_%d", cluster_id, i);
- DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"", host_id, cluster_power);
+ xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
+ temp_cluster_power = bprintf("%s",cluster_power);
+ temp_cluster_power = replace_random_parameter(temp_cluster_power);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", host_id, temp_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_power, temp_cluster_power);
SURFXML_BUFFER_SET(host_core, cluster_core);
- SURFXML_BUFFER_SET(host_availability, "1.0");
- xbt_dict_set(patterns,"radical",bprintf("%d",i),NULL);
- availability_file = bprintf("%s",cluster_availability_file);
- state_file = bprintf("%s",cluster_state_file);
- DEBUG1("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
- DEBUG1("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns));
- SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns));
- SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
- DEBUG0("</host>");
+ SURFXML_BUFFER_SET(host_availability, "1.0");
+ SURFXML_BUFFER_SET(host_coordinates, "");
+ xbt_free(availability_file);
+ availability_file = bprintf("%s",cluster_availability_file);
+ xbt_free(state_file);
+ state_file = bprintf("%s",cluster_state_file);
+ XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns));
+ XBT_DEBUG("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns));
+ SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns));
+ SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
+ XBT_DEBUG("</host>");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
- DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,cluster_bw, cluster_lat);
+ xbt_free(temp_cluster_power);
+
+ temp_cluster_bw = bprintf("%s",cluster_bw);
+ temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
+ temp_cluster_lat = bprintf("%s",cluster_lat);
+ temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,temp_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)
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, temp_cluster_bw);
+ SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
SURFXML_BUFFER_SET(link_state_file, "");
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+ xbt_free(temp_cluster_bw);
+ xbt_free(temp_cluster_lat);
free(link_id);
free(host_id);
}
break;
default:
- DEBUG0("Malformed radical");
+ XBT_DEBUG("Malformed radical");
}
xbt_dynar_free(&radical_ends);
}
xbt_dynar_free(&radical_elements);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
router_id =
bprintf("%s%s_router%s", cluster_prefix, cluster_id,
cluster_suffix);
link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id);
link_backbone = bprintf("%s_backbone", cluster_id);
- DEBUG1("<router id=\"%s\"/>", router_id);
- SURFXML_BUFFER_SET(router_id, router_id);;
+ XBT_DEBUG("<router id=\"%s\"/>", router_id);
+ SURFXML_BUFFER_SET(router_id, router_id);
SURFXML_START_TAG(router);
SURFXML_END_TAG(router);
- DEBUG3("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_router,cluster_bw, cluster_lat);
+ //TODO
+ xbt_dict_set(patterns, "radical", bprintf("_router"), xbt_free);
+ temp_cluster_bw = bprintf("%s",cluster_bw);
+ temp_cluster_bw = replace_random_parameter(temp_cluster_bw);
+ temp_cluster_lat = bprintf("%s",cluster_lat);
+ temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
+ XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_router,temp_cluster_bw, temp_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)
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, temp_cluster_bw);
+ SURFXML_BUFFER_SET(link_latency, temp_cluster_lat);
SURFXML_BUFFER_SET(link_bandwidth_file, "");
SURFXML_BUFFER_SET(link_latency_file, "");
SURFXML_BUFFER_SET(link_state_file, "");
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG3("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,cluster_bb_bw, cluster_bb_lat);
+ xbt_free(temp_cluster_bw);
+ xbt_free(temp_cluster_lat);
+
+ XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,cluster_bb_bw, cluster_bb_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)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
#ifdef HAVE_PCRE_LIB
char *new_suffix = xbt_strdup("");
char *pcre_link_backbone = bprintf("%s_backbone", cluster_id);
char *pcre_link_dst = bprintf("%s_link_$1dst", cluster_id);
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, route_src_dst);
- DEBUG0("symmetrical=\"NO\">");
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, route_src_dst);
+ XBT_DEBUG("symmetrical=\"NO\">");
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("<link_ctn\tid=\"%s\"/>", pcre_link_src);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG1("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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("<link_ctn\tid=\"%s\"/>", pcre_link_dst);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG0("</route>");
+ XBT_DEBUG("</route>");
SURFXML_END_TAG(route);
free(pcre_link_dst);
cluster_suffix);
}
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src, route_dst);
- DEBUG0("symmetrical=\"NO\">");
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src, route_dst);
+ XBT_DEBUG("symmetrical=\"NO\">");
SURFXML_BUFFER_SET(route_src, route_src);
SURFXML_BUFFER_SET(route_dst, route_dst);
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
xbt_dynar_get_as(tab_elements_num, j, int));
}
- DEBUG1("<link_ctn\tid=\"%s\"/>", route_src);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG1("<link_ctn\tid=\"%s_backbone\"/>", cluster_id);
+ XBT_DEBUG("<link_ctn\tid=\"%s_backbone\"/>", 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("<link_ctn\tid=\"%s\"/>", route_dst);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG0("</route>");
+ XBT_DEBUG("</route>");
SURFXML_END_TAG(route);
}
}
xbt_dynar_free(&tab_elements_num);
- free(router_id);
#endif
+ free(router_id);
free(link_backbone);
free(link_router);
xbt_dict_free(&patterns);
free(availability_file);
free(state_file);
- DEBUG0("</AS>");
+ XBT_DEBUG("</AS>");
SURFXML_END_TAG(AS);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
surfxml_bufferstack_pop(1);
}
+/*
+ * This function take a string and replace parameters from patterns dict.
+ * It returns the new value.
+ */
+static char* replace_random_parameter(char * string)
+{
+ char *test_string = NULL;
+
+ if(xbt_dict_size(random_value)==0)
+ return string;
+
+ string = xbt_str_varsubst(string, patterns); // for patterns of cluster
+ test_string = bprintf("${%s}", string);
+ test_string = xbt_str_varsubst(test_string,random_value); //Add ${xxxxx} for random Generator
+
+ if (strcmp(test_string,"")) { //if not empty, keep this value.
+ xbt_free(string);
+ string = test_string;
+ } //In other case take old value (without ${})
+ else
+ free(test_string);
+ return string;
+}
+
+static void clean_dict_random(void)
+{
+ XBT_DEBUG("Clean dict for random");
+ xbt_dict_free(&random_value);
+ xbt_dict_free(&patterns);
+}
static void routing_parse_Speer(void)
{
SURFXML_BUFFER_SET(AS_coordinates, peer_coord);
#ifdef HAVE_PCRE_LIB
SURFXML_BUFFER_SET(AS_routing, "RuleBased");
-
DEBUG1("<AS id=\"%s\"\trouting=\"RuleBased\">", peer_id);
+
XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", peer_id);
#else
SURFXML_BUFFER_SET(AS_routing, "Full");
-
DEBUG1("<AS id=\"%s\"\trouting=\"Full\">", peer_id);
+
XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", peer_id);
#endif
SURFXML_START_TAG(AS);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
host_id = bprintf("peer_%s", peer_id);
router_id = bprintf("router_%s", peer_id);
link_id_up = bprintf("link_%s_up", peer_id);
link_router = bprintf("%s_link_router", peer_id);
link_backbone = bprintf("%s_backbone", peer_id);
- DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, peer_power);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, peer_power);
A_surfxml_host_state = A_surfxml_host_state_ON;
SURFXML_BUFFER_SET(host_id, host_id);
SURFXML_BUFFER_SET(host_power, peer_power);
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_availability_file, peer_availability_file);
SURFXML_BUFFER_SET(host_state_file, peer_state_file);
+ SURFXML_BUFFER_SET(host_coordinates, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
- DEBUG2("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, peer_coord);
+ XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, peer_coord);
SURFXML_BUFFER_SET(router_id, router_id);
SURFXML_BUFFER_SET(router_coordinates, peer_coord);
SURFXML_START_TAG(router);
SURFXML_END_TAG(router);
- DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, peer_bw_in, peer_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, peer_bw_in, peer_lat);
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, peer_bw_out, peer_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, peer_bw_out, peer_lat);
A_surfxml_link_state = A_surfxml_link_state_ON;
A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
if(peer_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
// begin here
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", peer_id, router_id);
- DEBUG0("symmetrical=\"NO\">");
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", peer_id, router_id);
+ XBT_DEBUG("symmetrical=\"NO\">");
SURFXML_BUFFER_SET(route_src, peer_id);
SURFXML_BUFFER_SET(route_dst, router_id);
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
SURFXML_START_TAG(route);
- DEBUG1("<link_ctn\tid=\"%s\"/>", link_id_up);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", link_id_up);
SURFXML_BUFFER_SET(link_ctn_id, link_id_up);
A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG0("</route>");
+ XBT_DEBUG("</route>");
SURFXML_END_TAG(route);
//Opposite Route
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, peer_id);
- DEBUG0("symmetrical=\"NO\">");
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, peer_id);
+ XBT_DEBUG("symmetrical=\"NO\">");
SURFXML_BUFFER_SET(route_src, router_id);
SURFXML_BUFFER_SET(route_dst, peer_id);
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
SURFXML_START_TAG(route);
- DEBUG1("<link_ctn\tid=\"%s\"/>", link_id_down);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", link_id_down);
SURFXML_BUFFER_SET(link_ctn_id, link_id_down);
A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE;
if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG0("</route>");
+ XBT_DEBUG("</route>");
SURFXML_END_TAG(route);
- DEBUG0("</AS>");
+ XBT_DEBUG("</AS>");
SURFXML_END_TAG(AS);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
//xbt_dynar_free(&tab_elements_num);
surfxml_bufferstack_pop(1);
}
+static void routing_parse_Srandom(void)
+{
+ double mean, std, min, max, seed;
+ char *random_id = A_surfxml_random_id;
+ char *random_radical = A_surfxml_random_radical;
+ char *rd_name = NULL;
+ char *rd_value;
+ surf_parse_get_double(&mean,A_surfxml_random_mean);
+ surf_parse_get_double(&std,A_surfxml_random_std_deviation);
+ surf_parse_get_double(&min,A_surfxml_random_min);
+ surf_parse_get_double(&max,A_surfxml_random_max);
+ surf_parse_get_double(&seed,A_surfxml_random_seed);
+
+ double res = 0;
+ int i = 0;
+ random_data_t random = xbt_new0(s_random_data_t, 1);
+ char *tmpbuf;
+
+ xbt_dynar_t radical_elements;
+ unsigned int iter;
+ char *groups;
+ int start, end;
+ xbt_dynar_t radical_ends;
+
+ random->generator = A_surfxml_random_generator;
+ random->seed = seed;
+ random->min = min;
+ random->max = max;
+
+ /* Check user stupidities */
+ if (max < min)
+ THROW2(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
+ if (mean < min)
+ THROW2(arg_error, 0, "random->mean < random->min (%f < %f)", mean,
+ min);
+ if (mean > max)
+ THROW2(arg_error, 0, "random->mean > random->max (%f > %f)", mean,
+ max);
+
+ /* normalize the mean and standard deviation before storing */
+ random->mean = (mean - min) / (max - min);
+ random->std = std / (max - min);
+
+ if (random->mean * (1 - random->mean) < random->std * random->std)
+ THROW2(arg_error, 0, "Invalid mean and standard deviation (%f and %f)",
+ random->mean, random->std);
+
+ XBT_DEBUG("id = '%s' min = '%f' max = '%f' mean = '%f' std_deviatinon = '%f' generator = '%d' seed = '%ld' radical = '%s'",
+ random_id,
+ random->min,
+ random->max,
+ random->mean,
+ random->std,
+ random->generator,
+ random->seed,
+ random_radical);
+
+ if(xbt_dict_size(random_value)==0)
+ random_value = xbt_dict_new();
+
+ if(!strcmp(random_radical,""))
+ {
+ res = random_generate(random);
+ rd_value = bprintf("%f",res);
+ xbt_dict_set(random_value, random_id, rd_value, free);
+ }
+ else
+ {
+ radical_elements = xbt_str_split(random_radical, ",");
+ xbt_dynar_foreach(radical_elements, iter, groups) {
+ radical_ends = xbt_str_split(groups, "-");
+ switch (xbt_dynar_length(radical_ends)) {
+ case 1:
+ xbt_assert1(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",random_id);
+ res = random_generate(random);
+ tmpbuf = bprintf("%s%d",random_id,atoi(xbt_dynar_getfirst_as(radical_ends,char *)));
+ xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free);
+ xbt_free(tmpbuf);
+ break;
+
+ case 2: surf_parse_get_int(&start,
+ xbt_dynar_get_as(radical_ends, 0, char *));
+ surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *));
+ for (i = start; i <= end; i++) {
+ xbt_assert1(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",bprintf("%s%d",random_id,i));
+ res = random_generate(random);
+ tmpbuf = bprintf("%s%d",random_id,i);
+ xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free);
+ xbt_free(tmpbuf);
+ }
+ break;
+ default:
+ XBT_INFO("Malformed radical");
+ }
+ res = random_generate(random);
+ rd_name = bprintf("%s_router",random_id);
+ rd_value = bprintf("%f",res);
+ xbt_dict_set(random_value, rd_name, rd_value, free);
+
+ xbt_dynar_free(&radical_ends);
+ }
+ free(rd_name);
+ xbt_dynar_free(&radical_elements);
+ }
+}
+
+static void routing_parse_Erandom(void)
+{
+ xbt_dict_cursor_t cursor = NULL;
+ char *key;
+ char *elem;
+
+ xbt_dict_foreach(random_value, cursor, key, elem) {
+ XBT_DEBUG("%s = %s",key,elem);
+ }
+
+}
+
/*
* New methods to init the routing model component from the lua script
