#include "xbt/config.h"
#include "xbt/graph.h"
#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");
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);
+
/* this lines are only for replace use like index in the model table */
typedef enum {
SURF_MODEL_FULL = 0,
}
-static double vivaldi_get_link_latency (routing_component_t rc,
- const char *src, const char *dst)
+static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst)
{
double euclidean_dist;
xbt_dynar_t src_ctn, dst_ctn;
/**
* \brief Add a "host" to the network element list
*/
-static void parse_S_host(char *host_id, char* coord)
+static void parse_S_host(const char *host_id, const char* coord)
{
network_element_info_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
info->rc_component = current_routing;
info->rc_type = SURF_NETWORK_ELEMENT_HOST;
xbt_dict_set(global_routing->where_network_elements, host_id,
- (void *) info, NULL);
-
+ (void *) info, xbt_free);
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);
}
}
+static void parse_E_host(void)
+{
+ xbt_dict_cursor_t cursor = NULL;
+ char *key;
+ char *elem;
+
+ xbt_dict_foreach(current_property_set, cursor, key, elem) {
+ XBT_DEBUG("property : %s = %s",key,elem);
+ }
+}
+
/*
* \brief Add a host to the network element list from XML
*/
{
parse_S_host(A_surfxml_host_id, A_surfxml_host_coordinates);
}
+static void parse_E_host_XML(void)
+{
+ parse_E_host();
+}
/*
* \brief Add a host to the network element list from lua script
*/
-static void parse_S_host_lua(char *host_id, char *coord)
+static void parse_S_host_lua(const char *host_id, const char *coord)
{
parse_S_host(host_id, coord);
}
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, NULL);
-#ifdef HAVE_TRACING
- TRACE_surf_host_declaration(A_surfxml_router_id, 0);
-#endif
+ (void *) info, xbt_free);
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_dict_set(coordinates, A_surfxml_router_id, ctn, xbt_dynar_free_voidp);
}
}
/**
* \brief Set a new link on the actual list of link for a route or ASroute
*/
-static void parse_E_link_ctn_new_elem(char *link_id)
+static void parse_E_link_ctn_new_elem(const char *link_id)
{
char *val;
val = xbt_strdup(link_id);
/**
* \brief Set a new link on the actual list of link for a route or ASroute from lua
*/
-static void parse_E_link_c_ctn_new_elem_lua(char *link_id)
+static void parse_E_link_c_ctn_new_elem_lua(const char *link_id)
{
parse_E_link_ctn_new_elem(link_id);
}
static void parse_S_AS_XML(void)
{
parse_S_AS(A_surfxml_AS_id, A_surfxml_AS_routing);
+
+ if (strcmp(A_surfxml_AS_coordinates,"")) {
+ 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);
+ }
}
/*
* When you finish to read the routing component, other structures must be created.
* the "end" method allow to do that for any routing model type
*/
-static void parse_E_AS(char *AS_id)
+static void parse_E_AS(const char *AS_id)
{
if (current_routing == NULL) {
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, NULL);
+ current_routing->name, info, xbt_free);
(*(current_routing->routing->unload)) ();
(*(current_routing->routing->end)) ();
current_routing = current_routing->routing_father;
/*
* \brief Finish the creation of a new routing component from lua
*/
-static void parse_E_AS_lua(char *id)
+static void parse_E_AS_lua(const char *id)
{
parse_E_AS(id);
}
/* Aux Business methods */
+/**
+ * \brief Get the AS name of the element
+ *
+ * \param name the host name
+ *
+ */
+static char* elements_As_name(const char *name)
+{
+ routing_component_t as_comp;
+
+ /* (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;
+ return as_comp->name;
+}
+
+
/**
* \brief Get the AS father and the first elements of the chain
*
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");
"bad gateway for route between \"%s\" and \"%s\"", src,
dst);
- if (src != e_route_cnt->src_gateway) {
+ if (strcmp(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_push(e_route->generic_route.link_list, &link);
}
- if (e_route_cnt->dst_gateway != dst) {
+ if (strcmp(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);
{
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, e_route_cnt;
+ route_extended_t e_route_cnt;
xbt_dynar_t elem_father_list = elements_father(src, dst);
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)) {
} 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);
"bad gateway for route between \"%s\" and \"%s\"", src,
dst);
latency =
- (*(common_father->get_latency)) (common_father, e_route_cnt->src_gateway,
- e_route_cnt->src_gateway);
+ (*(common_father->get_latency)) (common_father, elements_As_name(src),
+ elements_As_name(dst));
+
xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"",
src_father->name, dst_father->name);
{
route_extended_t e_route;
- 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);
+ xbt_dynar_t elem_father_list = NULL;
+ routing_component_t common_father = NULL;
if (strcmp(src, dst))
e_route = _get_route(src, dst);
- else
+ else {
+ elem_father_list = elements_father(src, dst);
+ common_father =
+ xbt_dynar_get_as(elem_father_list, 0, routing_component_t);
+
e_route = (*(common_father->get_route)) (common_father, src, dst);
+ xbt_dynar_free(&elem_father_list);
+ }
xbt_assert2(e_route, "no route between \"%s\" and \"%s\"", src, dst);
xbt_free(e_route->dst_gateway);
xbt_free(e_route);
- xbt_dynar_free(&elem_father_list);
/*
if (xbt_dynar_length(global_routing->last_route) == 0)
latency = (*(common_father->get_latency)) (common_father, src, dst);
xbt_assert2(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst);
+ xbt_dynar_free(&elem_father_list);
return latency;
}
*name)
{
network_element_info_t rc = NULL;
- rc = xbt_dict_get(global_routing->where_network_elements, name);
+ rc = xbt_dict_get_or_null(global_routing->where_network_elements, name);
+ if(!rc) return SURF_NETWORK_ELEMENT_NULL;
return rc->rc_type;
}
*/
void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_t get_link_latency_fun)
{
-
/* config the uniq global routing */
global_routing = xbt_new0(s_routing_global_t, 1);
global_routing->where_network_elements = xbt_dict_new();
/* 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_route_cb_list,
surfxml_add_callback(STag_surfxml_peer_cb_list,
&routing_parse_Speer);
- surfxml_add_callback(STag_surfxml_config_cb_list,
- &routing_parse_Sconfig);
- surfxml_add_callback(ETag_surfxml_config_cb_list,
- &routing_parse_Econfig);
+
+#ifdef HAVE_TRACING
+ instr_routing_define_callbacks();
+#endif
+}
+
+void surf_parse_add_callback_config(void)
+{
+ surfxml_add_callback(STag_surfxml_config_cb_list, &routing_parse_Sconfig);
+ 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);
}
/* ************************************************************************** */
new_component->generic_routing.finalize = full_finalize;
new_component->generic_routing.to_index = xbt_dict_new();
new_component->generic_routing.bypassRoutes = xbt_dict_new();
+ new_component->generic_routing.get_network_element_type = get_network_element_type;
return new_component;
}
(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);
+ "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_free(link_route_to_test);
+ 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);
new_component->generic_routing.finalize = floyd_finalize;
new_component->generic_routing.to_index = xbt_dict_new();
new_component->generic_routing.bypassRoutes = xbt_dict_new();
+ new_component->generic_routing.get_network_element_type = get_network_element_type;
return new_component;
}
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;
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;
}
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;
-
+ XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id);
xbt_node_t src = NULL;
xbt_node_t dst = NULL;
+
graph_node_map_element_t src_elm = (graph_node_map_element_t)
xbt_dict_get_or_null_ext(routing->graph_node_map,
(char *) (&src_id),
(char *) (&dst_id),
sizeof(int));
+
if (src_elm)
src = src_elm->node;
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;
new_component->cached = cached;
new_component->generic_routing.to_index = xbt_dict_new();
new_component->generic_routing.bypassRoutes = xbt_dict_new();
+ new_component->generic_routing.get_network_element_type = get_network_element_type;
return new_component;
}
xbt_dynar_t nodes = NULL;
/* Create the topology graph */
+ if(!routing->route_graph)
routing->route_graph = xbt_graph_new_graph(1, NULL);
+ if(!routing->graph_node_map)
routing->graph_node_map = xbt_dict_new();
if (routing->cached && !routing->route_cache)
- routing->route_cache = xbt_dict_new();
+ routing->route_cache = xbt_dict_new();
/* Add the loopback if needed */
if (current_routing->hierarchy == SURF_ROUTING_BASE)
src_id = xbt_dict_get_or_null(rc->to_index, src);
dst_id = xbt_dict_get_or_null(rc->to_index, dst);
+ /* Create the topology graph */
+ if(!routing->route_graph)
+ routing->route_graph = xbt_graph_new_graph(1, NULL);
+ if(!routing->graph_node_map)
+ routing->graph_node_map = xbt_dict_new();
+
if (routing->cached && !routing->route_cache)
routing->route_cache = xbt_dict_new();
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 =
new_component->generic_routing.get_latency = generic_get_link_latency;
new_component->generic_routing.get_bypass_route = rulebased_get_bypass_route;
new_component->generic_routing.finalize = rulebased_finalize;
+ new_component->generic_routing.get_network_element_type = get_network_element_type;
/* initialization of internal structures */
new_component->dict_processing_units = xbt_dict_new();
new_component->dict_autonomous_systems = xbt_dict_new();
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;
xbt_dynar_foreach(route->generic_route.link_list,i,link) {
latency += get_link_latency(link);
}
+ generic_free_extended_route(route);
return latency;
}
static void generic_src_dst_check(routing_component_t rc, const char *src,
const char *dst)
{
-
+ #ifndef NDEBUG
routing_component_t src_as = ((network_element_info_t)
xbt_dict_get_or_null
(global_routing->where_network_elements,
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);
+#endif
}
static void routing_parse_Sconfig(void)
{
- //TODO
- DEBUG0("WARNING tag config not yet implemented.");
- DEBUG1("Configuration name = %s",A_surfxml_config_id);
+ XBT_DEBUG("START configuration name = %s",A_surfxml_config_id);
}
static void routing_parse_Econfig(void)
{
- //TODO
xbt_dict_cursor_t cursor = NULL;
char *key;
char *elem;
+ char *cfg;
xbt_dict_foreach(current_property_set, cursor, key, elem) {
- DEBUG2("property : %s = %s",key,elem);
+ cfg = bprintf("%s:%s",key,elem);
+ if(xbt_cfg_is_default_value(_surf_cfg_set, key))
+ xbt_cfg_set_parse(_surf_cfg_set, cfg);
+ else
+ XBT_INFO("The custom configuration '%s' is already define by user!",key);
}
+ XBT_DEBUG("End configuration name = %s",A_surfxml_config_id);
}
static void routing_parse_Scluster(void)
char *cluster_suffix = A_surfxml_cluster_suffix;
char *cluster_radical = A_surfxml_cluster_radical;
char *cluster_power = A_surfxml_cluster_power;
+ 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 *cluster_state_file = A_surfxml_cluster_state_file;
char *host_id, *groups, *link_id = NULL;
char *router_id, *link_router, *link_backbone;
+ char *availability_file = bprintf("%s",cluster_availability_file);
+ char *state_file = bprintf("%s",cluster_state_file);
+
+ 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");
- SURFXML_BUFFER_SET(host_availability_file, "");
- SURFXML_BUFFER_SET(host_state_file, "");
+ 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);
free(link_id);
free(host_id);
break;
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 *));
- DEBUG2("Create hosts and links from %d to %d", start, end);
for (i = start; i <= end; i++) {
host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix);
#ifndef HAVE_PCRE_LIB
#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");
- SURFXML_BUFFER_SET(host_availability_file, "");
- SURFXML_BUFFER_SET(host_state_file, "");
+ 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_bw, cluster_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 ${})
+
+ return string;
+}
static void routing_parse_Speer(void)
{
char *peer_bw_out = A_surfxml_peer_bw_out;
char *peer_lat = A_surfxml_peer_lat;
char *peer_coord = A_surfxml_peer_coordinates;
+ char *peer_state_file = A_surfxml_peer_state_file;
+ char *peer_availability_file = A_surfxml_peer_availability_file;
char *host_id = NULL;
char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down;
surfxml_bufferstack_push(1);
SURFXML_BUFFER_SET(AS_id, peer_id);
+ 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, "");
- SURFXML_BUFFER_SET(host_state_file, "");
+ 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)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
- if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FATPIPE)
-{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_id_up);
SURFXML_BUFFER_SET(link_bandwidth, peer_bw_in);
SURFXML_BUFFER_SET(link_latency, peer_lat);
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)
{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;}
- if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FATPIPE)
-{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;}
SURFXML_BUFFER_SET(link_id, link_id_down);
SURFXML_BUFFER_SET(link_bandwidth, peer_bw_out);
SURFXML_BUFFER_SET(link_latency, peer_lat);
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;
+ 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);
+ xbt_dict_set(random_value, random_id, bprintf("%f",res), 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);
+ xbt_dict_set(random_value, bprintf("%s_router",random_id), bprintf("%f",res), free);
+
+ xbt_dynar_free(&radical_ends);
+ }
+ 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