/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-
-
#include <float.h>
#include "gras_config.h"
#ifdef HAVE_PCRE_LIB
-#include <pcre.h> /* regular expresion library */
+#include <pcre.h> /* regular expression library */
#endif
#include "surf_private.h"
#include "xbt/dynar.h"
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 */
+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 */
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 */
+static void model_rulebased_load(void); /* load parse functions for rulebased routing model */
static void model_rulebased_unload(void); /* unload parse functions for rulebased routing model */
-static void model_rulebased_end(void); /* finalize the creation of rulebased routing model */
+static void model_rulebased_end(void); /* finalize the creation of rulebased routing model */
-static void *model_none_create(void); /* none routing model */
-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 *model_none_create(void); /* none routing model */
+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_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_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 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);
} e_routing_types;
-/* must be finish with null and carefull if change de order */
+/* must finish with NULL and be careful if the order is changed */
struct s_model_type routing_models[] = { {"Full",
"Full routing data (fast, large memory requirements, fully expressive)",
model_full_create,
static xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */
-static double eculidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
+static double euclidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst)
{
double src_coord, dst_coord;
if(dst_ctn == NULL || src_ctn == NULL)
xbt_die("Coord src '%s' :%p dst '%s' :%p",src,src_ctn,dst,dst_ctn);
- euclidean_dist = sqrt (eculidean_dist_comp(0,src_ctn,dst_ctn)+eculidean_dist_comp(1,src_ctn,dst_ctn))
+ euclidean_dist = sqrt (euclidean_dist_comp(0,src_ctn,dst_ctn)+euclidean_dist_comp(1,src_ctn,dst_ctn))
+fabs(atof(xbt_dynar_get_as(src_ctn, 2, char *)))+fabs(atof(xbt_dynar_get_as(dst_ctn, 2, char *)));
- xbt_assert2(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist);
+ xbt_assert(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist);
return euclidean_dist;
-
- /*
- x = atof(xbt_dynar_get_as(src_ctn, 0, char *))-atof(xbt_dynar_get_as(dst_ctn, 0, char *));
- y = atof(xbt_dynar_get_as(src_ctn, 1, char *));
- h = atof(xbt_dynar_get_as(ctn, 2, char *));
- sqrt((c1->x - c2->x) * (c1->x - c2->x) + (c1->y - c2->y) * (c1->y - c2->y)) + fabs(c1->h) + fabs(c2->h);
-
- if (strcmp(coord,"")) {
- xbt_dynar_t ctn = xbt_str_split_str(coord, " ");
- xbt_dynar_shrink(ctn,0);
- xbt_lib_set(host_lib, host_id, COORD_HOST_LEVEL, ctn);
- }
- */
}
/**
network_element_info_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_BASE;
- xbt_assert1(!xbt_lib_get_or_null(host_lib, host_id,ROUTING_HOST_LEVEL),
+ xbt_assert(!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,
+ xbt_assert(current_routing->set_processing_unit,
"no defined method \"set_processing_unit\" in \"%s\"",
current_routing->name);
(*(current_routing->set_processing_unit)) (current_routing, host_id);
if (current_routing->hierarchy == SURF_ROUTING_NULL)
current_routing->hierarchy = SURF_ROUTING_BASE;
- xbt_assert1(!xbt_lib_get_or_null(as_router_lib,A_surfxml_router_id, ROUTING_ASR_LEVEL),
+ xbt_assert(!xbt_lib_get_or_null(as_router_lib,A_surfxml_router_id, ROUTING_ASR_LEVEL),
"Reading a router, processing unit \"%s\" already exists",
router_id);
- xbt_assert1(current_routing->set_processing_unit,
+ xbt_assert(current_routing->set_processing_unit,
"no defined method \"set_processing_unit\" in \"%s\"",
current_routing->name);
(*(current_routing->set_processing_unit)) (current_routing,
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",
+ THROWF(arg_error, 0, "Route between %s to %s can not be defined",
src_id, dst_id);
src = src_id;
dst = dst_id;
- xbt_assert2(strlen(src) > 0 || strlen(dst) > 0,
+ xbt_assert(strlen(src) > 0 || strlen(dst) > 0,
"Some limits are null in the route between \"%s\" and \"%s\"",
src, dst);
link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
static void parse_S_ASroute_new_and_endpoints(void)
{
if (src != NULL && dst != NULL && link_list != NULL)
- THROW2(arg_error, 0, "Route between %s to %s can not be defined",
+ THROWF(arg_error, 0, "Route between %s to %s can not be defined",
A_surfxml_ASroute_src, A_surfxml_ASroute_dst);
src = A_surfxml_ASroute_src;
dst = A_surfxml_ASroute_dst;
gw_src = A_surfxml_ASroute_gw_src;
gw_dst = A_surfxml_ASroute_gw_dst;
- xbt_assert2(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
+ xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
|| strlen(gw_dst) > 0,
"Some limits are null in the route between \"%s\" and \"%s\"",
src, dst);
static void parse_S_bypassRoute_new_and_endpoints(void)
{
if (src != NULL && dst != NULL && link_list != NULL)
- THROW2(arg_error, 0,
+ THROWF(arg_error, 0,
"Bypass Route between %s to %s can not be defined",
A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
src = A_surfxml_bypassRoute_src;
dst = A_surfxml_bypassRoute_dst;
gw_src = A_surfxml_bypassRoute_gw_src;
gw_dst = A_surfxml_bypassRoute_gw_dst;
- xbt_assert2(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
+ xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0
|| strlen(gw_dst) > 0,
"Some limits are null in the route between \"%s\" and \"%s\"",
src, 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,
+ xbt_assert(current_routing->set_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
(*(current_routing->set_route)) (current_routing, src, dst, route);
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(current_routing->set_ASroute,
+ xbt_assert(current_routing->set_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
(*(current_routing->set_ASroute)) (current_routing, src, dst, e_route);
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(current_routing->set_bypassroute,
+ xbt_assert(current_routing->set_bypassroute,
"no defined method \"set_bypassroute\" in \"%s\"",
current_routing->name);
(*(current_routing->set_bypassroute)) (current_routing, src, dst,
} else if (current_routing != NULL && global_routing->root != NULL) {
- xbt_assert1(!xbt_dict_get_or_null
+ xbt_assert(!xbt_dict_get_or_null
(current_routing->routing_sons, AS_id),
"The AS \"%s\" already exists", AS_id);
/* it is a part of the tree */
(*(current_routing->routing->unload)) ();
} else {
- THROW0(arg_error, 0, "All defined components must be belong to a AS");
+ THROWF(arg_error, 0, "All defined components must be belong to a AS");
}
/* set the new parse rules */
(*(new_routing->routing->load)) ();
static void parse_S_AS_XML(void)
{
parse_S_AS(A_surfxml_AS_id, A_surfxml_AS_routing);
-
- if (strcmp(A_surfxml_AS_coordinates,"")) {
- if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'");
- 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_lib_set(as_router_lib,A_surfxml_AS_id,COORD_ASR_LEVEL,(void *) ctn);
- }
}
/*
{
if (current_routing == NULL) {
- THROW1(arg_error, 0, "Close AS(%s), that never open", AS_id);
+ THROWF(arg_error, 0, "Close AS(%s), that never open", AS_id);
} else {
network_element_info_t info = NULL;
- xbt_assert1(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL),
+ xbt_assert(!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;
static xbt_dynar_t elements_father(const char *src, const char *dst)
{
- xbt_assert0(src && dst, "bad parameters for \"elements_father\" method");
+ xbt_assert(src && dst, "bad parameters for \"elements_father\" method");
xbt_dynar_t result = xbt_dynar_new(sizeof(char *), NULL);
src_as = ((network_element_info_t)src_data)->rc_component;
dst_as = ((network_element_info_t)dst_data)->rc_component;
- xbt_assert2(src_as
+ xbt_assert(src_as
&& dst_as,
"Ask for route \"from\"(%s) or \"to\"(%s) no found", src,
dst);
* \param src the source host name
* \param dst the destination host name
*
- * This fuction is call by "get_route". It allow to walk through the
- * routing components tree.
+ * This function is called by "get_route". It allows to walk recursively
+ * through the routing components tree.
*/
static route_extended_t _get_route(const char *src, const char *dst)
{
XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst);
- xbt_assert0(src && dst, "bad parameters for \"_get_route\" method");
+ xbt_assert(src && dst, "bad parameters for \"_get_route\" method");
route_extended_t e_route, e_route_cnt, e_route_src = NULL, e_route_dst =
NULL;
if (strcmp(src, dst)) {
e_route_cnt =
(*(common_father->get_route)) (common_father, src, dst);
- xbt_assert2(e_route_cnt, "no route between \"%s\" and \"%s\"", src,
+ xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", src,
dst);
xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
xbt_dynar_push(e_route->generic_route.link_list, &link);
(*(common_father->get_route)) (common_father, src_father->name,
dst_father->name);
- xbt_assert2(e_route_cnt, "no route between \"%s\" and \"%s\"",
+ xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"",
src_father->name, dst_father->name);
- xbt_assert2((e_route_cnt->src_gateway == NULL) ==
+ xbt_assert((e_route_cnt->src_gateway == NULL) ==
(e_route_cnt->dst_gateway == NULL),
"bad gateway for route between \"%s\" and \"%s\"", src,
dst);
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,
+ xbt_assert(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);
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\"",
+ xbt_assert(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);
double latency, latency_src, latency_dst = 0.0;
XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst);
- xbt_assert0(src && dst, "bad parameters for \"_get_route\" method");
+ xbt_assert(src && dst, "bad parameters for \"_get_route\" method");
route_extended_t e_route_cnt;
if (strcmp(src, dst)) {
latency =
(*(common_father->get_latency)) (common_father, src, dst);
- xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"", src,
+ xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", src,
dst);
} else latency = 0;
} else { /* SURF_ROUTING_RECURSIVE */
e_route_bypass =
(*(common_father->get_bypass_route)) (common_father, src, dst);
- xbt_assert0(!e_route_bypass,"Bypass cannot work yet with get_latency");
+ xbt_assert(!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\"",
+ xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"",
src_father->name, dst_father->name);
- xbt_assert2((e_route_cnt->src_gateway == NULL) ==
+ xbt_assert((e_route_cnt->src_gateway == NULL) ==
(e_route_cnt->dst_gateway == NULL),
"bad gateway for route between \"%s\" and \"%s\"", src,
dst);
(*(common_father->get_latency)) (common_father, elements_As_name(src),
elements_As_name(dst));
- xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"",
+ xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"",
src_father->name, dst_father->name);
if (src != e_route_cnt->src_gateway) {
latency_src = _get_latency(src, e_route_cnt->src_gateway);
- xbt_assert2(latency_src>=0, "no route between \"%s\" and \"%s\"", src,
+ xbt_assert(latency_src>=0, "no route between \"%s\" and \"%s\"", src,
e_route_cnt->src_gateway);
latency += latency_src;
}
if (e_route_cnt->dst_gateway != dst) {
latency_dst = _get_latency(e_route_cnt->dst_gateway, dst);
- xbt_assert2(latency_dst>=0, "no route between \"%s\" and \"%s\"",
+ xbt_assert(latency_dst>=0, "no route between \"%s\" and \"%s\"",
e_route_cnt->dst_gateway, dst);
latency += latency_dst;
}
xbt_dynar_free(&elem_father_list);
}
- xbt_assert2(e_route, "no route between \"%s\" and \"%s\"", src, dst);
+ xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst);
if (global_routing->last_route)
xbt_dynar_free(&(global_routing->last_route));
else
latency = (*(common_father->get_latency)) (common_father, src, dst);
- xbt_assert2(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst);
+ xbt_assert(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst);
xbt_dynar_free(&elem_father_list);
return latency;
char *tmp_name = rc->name;
xbt_dict_free(&tmp_sons);
xbt_free(tmp_name);
- xbt_assert1(rc->finalize, "no defined method \"finalize\" in \"%s\"",
+ xbt_assert(rc->finalize, "no defined method \"finalize\" in \"%s\"",
current_routing->name);
(*(rc->finalize)) (rc);
}
{
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_prop_cb_list, &parse_properties_XML);
surfxml_add_callback(STag_surfxml_AS_cb_list, &surf_parse_models_setup);
surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom);
}
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
+ xbt_assert(src_id
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
src, dst);
static route_extended_t full_get_route(routing_component_t rc,
const char *src, const char *dst)
{
- xbt_assert1(rc && src
+ xbt_assert(rc && src
&& dst,
"Invalid params for \"get_route\" function at AS \"%s\"",
rc->name);
generic_src_dst_check(rc, src, 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
+ xbt_assert(src_id
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
src, 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
+ xbt_assert(src_id
&& dst_id, "Network elements %s or %s not found", src, dst);
- xbt_assert2(xbt_dynar_length(route->generic_route.link_list) > 0,
+ xbt_assert(xbt_dynar_length(route->generic_route.link_list) > 0,
"Invalid count of links, must be greater than zero (%s,%s)",
src, dst);
xbt_dynar_foreach(route->generic_route.link_list,i,link_name)
{
void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
- xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
xbt_dynar_push(link_route_to_test,&link);
}
- xbt_assert2(!xbt_dynar_compare(
+ xbt_assert(!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),
{
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;
+ char *gw_tmp ;
+ gw_tmp = route->src_gateway;
+ route->src_gateway = route->dst_gateway;
+ route->dst_gateway = gw_tmp;
}
if(TO_ROUTE_FULL(*dst_id, *src_id))
{
{
link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
- xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
xbt_dynar_push(link_route_to_test,&link);
}
- xbt_assert2(!xbt_dynar_compare(
+ xbt_assert(!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),
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 (rc->hierarchy == SURF_ROUTING_BASE) generic_free_route((route_t)route) ;
+ else generic_free_extended_route((route_extended_t)route);
}
/* ************************************************************************** */
static route_extended_t floyd_get_route(routing_component_t rc,
const char *src, const char *dst)
{
- xbt_assert1(rc && src
+ xbt_assert(rc && src
&& dst,
"Invalid params for \"get_route\" function at AS \"%s\"",
rc->name);
generic_src_dst_check(rc, src, 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
+ xbt_assert(src_id
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
src, dst);
pred = TO_FLOYD_PRED(*src_id, pred);
if (pred == -1) /* if no pred in route -> no route to host */
break;
- xbt_assert2(TO_FLOYD_LINK(pred, prev_pred),
+ xbt_assert(TO_FLOYD_LINK(pred, prev_pred),
"Invalid link for the route between \"%s\" or \"%s\"", src,
dst);
&& strcmp(gw_dst, prev_gw_src)) {
xbt_dynar_t e_route_as_to_as =
(*(global_routing->get_route)) (gw_dst, prev_gw_src);
- xbt_assert2(e_route_as_to_as, "no route between \"%s\" and \"%s\"",
+ xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"",
gw_dst, prev_gw_src);
links = e_route_as_to_as;
int pos = 0;
first = 0;
} while (pred != *src_id);
- xbt_assert4(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")",
+ xbt_assert(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")",
*src_id, *dst_id, src, dst);
if (rc->hierarchy == SURF_ROUTING_RECURSIVE) {
xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name)
{
void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
- xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
xbt_dynar_push(link_route_to_test,&link);
}
- xbt_assert2(!xbt_dynar_compare(
+ xbt_assert(!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),
{
link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *);
void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
- xbt_assert1(link,"Link : '%s' doesn't exists.",link_name);
+ xbt_assert(link,"Link : '%s' doesn't exists.",link_name);
xbt_dynar_push(link_route_to_test,&link);
}
- xbt_assert2(!xbt_dynar_compare(
+ xbt_assert(!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),
const char *src,
const char *dst)
{
- xbt_assert1(rc && src
+ xbt_assert(rc && src
&& dst,
"Invalid params for \"get_route\" function at AS \"%s\"",
rc->name);
generic_src_dst_check(rc, src, 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
+ xbt_assert(src_id
&& dst_id,
"Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table",
src, dst);
graph_node_map_search(routing, *src_id);
graph_node_map_element_t dst_elm =
graph_node_map_search(routing, *dst_id);
- xbt_assert2(src_elm != NULL
+ xbt_assert(src_elm != NULL
&& dst_elm != NULL, "src %d or dst %d does not exist",
*src_id, *dst_id);
src_node_id = ((graph_node_data_t)
xbt_edge_t edge =
xbt_graph_get_edge(routing->route_graph, node_s_v, node_e_v);
- xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id,
+ xbt_assert(edge != NULL, "no route between host %d and %d", *src_id,
*dst_id);
e_route = (route_extended_t) xbt_graph_edge_get_data(edge);
xbt_edge_t edge =
xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v);
- xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id,
+ xbt_assert(edge != NULL, "no route between host %d and %d", *src_id,
*dst_id);
prev_gw_src = gw_src;
&& strcmp(gw_dst, prev_gw_src)) {
xbt_dynar_t e_route_as_to_as =
(*(global_routing->get_route)) (gw_dst, prev_gw_src);
- xbt_assert2(e_route_as_to_as, "no route between \"%s\" and \"%s\"",
+ xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"",
gw_dst, prev_gw_src);
links = e_route_as_to_as;
int pos = 0;
rule_route_t ruleroute = xbt_new0(s_rule_route_t, 1);
const char *error;
int erroffset;
+
+ if(!strcmp(rc->routing->name,"Vivaldi")){
+ if(xbt_dynar_length(route->generic_route.link_list) != 0)
+ xbt_die("You can't have link_ctn with Model Vivaldi.");
+ }
+
ruleroute->re_src = pcre_compile(src, 0, &error, &erroffset, NULL);
- xbt_assert3(ruleroute->re_src,
+ xbt_assert(ruleroute->re_src,
"PCRE compilation failed at offset %d (\"%s\"): %s\n",
erroffset, src, error);
ruleroute->re_dst = pcre_compile(dst, 0, &error, &erroffset, NULL);
- xbt_assert3(ruleroute->re_src,
+ xbt_assert(ruleroute->re_src,
"PCRE compilation failed at offset %d (\"%s\"): %s\n",
erroffset, dst, error);
ruleroute->re_str_link = route->generic_route.link_list;
rule_route_extended_t ruleroute_e = xbt_new0(s_rule_route_extended_t, 1);
const char *error;
int erroffset;
+
+ if(!strcmp(rc->routing->name,"Vivaldi")){
+ if(xbt_dynar_length(route->generic_route.link_list) != 0)
+ xbt_die("You can't have link_ctn with Model Vivaldi.");
+ }
+
ruleroute_e->generic_rule_route.re_src =
pcre_compile(src, 0, &error, &erroffset, NULL);
- xbt_assert3(ruleroute_e->generic_rule_route.re_src,
+ xbt_assert(ruleroute_e->generic_rule_route.re_src,
"PCRE compilation failed at offset %d (\"%s\"): %s\n",
erroffset, src, error);
ruleroute_e->generic_rule_route.re_dst =
pcre_compile(dst, 0, &error, &erroffset, NULL);
- xbt_assert3(ruleroute_e->generic_rule_route.re_src,
+ xbt_assert(ruleroute_e->generic_rule_route.re_src,
"PCRE compilation failed at offset %d (\"%s\"): %s\n",
erroffset, dst, error);
ruleroute_e->generic_rule_route.re_str_link =
&& value[i + number_length] <= '9') {
number_length++;
}
- xbt_assert2(number_length != 0,
+ xbt_assert(number_length != 0,
"bad string parameter, no number indication, at offset: %d (\"%s\")",
i, value);
// solve number
number = atoi(value + i);
i = i + number_length;
- xbt_assert2(i + 2 < value_length,
+ xbt_assert(i + 2 < value_length,
"bad string parameter, too few chars, at offset: %d (\"%s\")",
i, value);
}
i = i + 3;
- xbt_assert4(param_size >= number,
+ xbt_assert(param_size >= number,
"bad string parameter, not enough length param_size, at offset: %d (\"%s\") %d %d",
i, value, param_size, number);
} while (i < value_length && i_result_buffer < BUFFER_SIZE);
- xbt_assert2(i_result_buffer < BUFFER_SIZE,
+ xbt_assert(i_result_buffer < BUFFER_SIZE,
"solving string \"%s\", small buffer size (%d)", value,
BUFFER_SIZE);
result_result[i_result_buffer] = 0;
const char *src,
const char *dst)
{
- xbt_assert1(rc && src
+ xbt_assert(rc && src
&& dst,
"Invalid params for \"get_route\" function at AS \"%s\"",
rc->name);
ovector_dst, OVECCOUNT);
if (rc_dst >= 0) {
res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src);
- xbt_assert1(!res, "error solving substring list for src \"%s\"", src);
+ xbt_assert(!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);
+ xbt_assert(!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 =
if (link)
xbt_dynar_push(links_list, &link);
else
- THROW1(mismatch_error, 0, "Link %s not found", new_link_name);
+ THROWF(mismatch_error, 0, "Link %s not found", new_link_name);
xbt_free(new_link_name);
}
}
char *route_name;
route_name = bprintf("%s#%s", src, dst);
- xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list) > 0,
+ xbt_assert(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),
+ xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name),
"The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists",
src, e_route->src_gateway, dst, e_route->dst_gateway);
new_route->link_list =
xbt_dynar_new(global_routing->size_of_link, NULL);
- xbt_assert0(hierarchy == SURF_ROUTING_BASE,
+ xbt_assert(hierarchy == SURF_ROUTING_BASE,
"the hierarchy type is not SURF_ROUTING_BASE");
links = ((route_t) data)->link_list;
else
xbt_dynar_unshift(links_id, &link);
} else
- THROW1(mismatch_error, 0, "Link %s not found", link_name);
+ THROWF(mismatch_error, 0, "Link %s not found", link_name);
}
return new_route;
new_e_route->src_gateway = NULL;
new_e_route->dst_gateway = NULL;
- xbt_assert0(hierarchy == SURF_ROUTING_BASE
+ xbt_assert(hierarchy == SURF_ROUTING_BASE
|| hierarchy == SURF_ROUTING_RECURSIVE,
"the hierarchy type is not defined");
} else if (hierarchy == SURF_ROUTING_RECURSIVE) {
e_route = (route_extended_t) data;
- xbt_assert0(e_route->src_gateway
+ xbt_assert(e_route->src_gateway
&& e_route->dst_gateway, "bad gateway, is null");
links = e_route->generic_route.link_list;
/* remeber not erase the gateway names */
- new_e_route->src_gateway = e_route->src_gateway;
- new_e_route->dst_gateway = e_route->dst_gateway;
+ new_e_route->src_gateway = strdup(e_route->src_gateway);
+ new_e_route->dst_gateway = strdup(e_route->dst_gateway);
}
links_id = new_e_route->generic_route.link_list;
else
xbt_dynar_unshift(links_id, &link);
} else
- THROW1(mismatch_error, 0, "Link %s not found", link_name);
+ THROWF(mismatch_error, 0, "Link %s not found", link_name);
}
return new_e_route;
xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS",
src, src_as->name, dst, 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);
+ xbt_die("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)",
+ src,dst,src_as->name, dst_as->name,rc->name);
}
static void routing_parse_Sconfig(void)
SURFXML_BUFFER_SET(AS_id, cluster_id);
#ifdef HAVE_PCRE_LIB
SURFXML_BUFFER_SET(AS_routing, "RuleBased");
- SURFXML_BUFFER_SET(AS_coordinates, "");
XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", cluster_id);
#else
SURFXML_BUFFER_SET(AS_routing, "Full");
- SURFXML_BUFFER_SET(AS_coordinates, "");
XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", cluster_id);
#endif
SURFXML_START_TAG(AS);
static void clean_dict_random(void)
{
- XBT_DEBUG("Clean dict for random");
xbt_dict_free(&random_value);
xbt_dict_free(&patterns);
}
char *host_id = NULL;
char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down;
-#ifdef HAVE_PCRE_LIB
-
-#endif
-
- int peer_sharing_policy = AX_surfxml_peer_sharing_policy;
-
-#ifndef HAVE_PCRE_LIB
- //xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL);
- //char *route_src, *route_dst;
- //int j;
-#endif
-
static unsigned int surfxml_buffer_stack_stack_ptr = 1;
static unsigned int surfxml_buffer_stack_stack[1024];
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");
- XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", peer_id);
-#else
+
SURFXML_BUFFER_SET(AS_routing, "Full");
XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", peer_id);
-#endif
+
SURFXML_START_TAG(AS);
XBT_DEBUG(" ");
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;}
SURFXML_BUFFER_SET(link_id, link_id_up);
SURFXML_BUFFER_SET(link_bandwidth, peer_bw_in);
SURFXML_BUFFER_SET(link_latency, 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;}
SURFXML_BUFFER_SET(link_id, link_id_down);
SURFXML_BUFFER_SET(link_bandwidth, peer_bw_out);
SURFXML_BUFFER_SET(link_latency, peer_lat);
XBT_DEBUG(" ");
// begin here
- XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", peer_id, router_id);
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", host_id, router_id);
XBT_DEBUG("symmetrical=\"NO\">");
- SURFXML_BUFFER_SET(route_src, peer_id);
+ SURFXML_BUFFER_SET(route_src, host_id);
SURFXML_BUFFER_SET(route_dst, router_id);
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
SURFXML_START_TAG(route);
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)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
SURFXML_END_TAG(route);
//Opposite Route
- XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, peer_id);
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, host_id);
XBT_DEBUG("symmetrical=\"NO\">");
SURFXML_BUFFER_SET(route_src, router_id);
- SURFXML_BUFFER_SET(route_dst, peer_id);
+ SURFXML_BUFFER_SET(route_dst, host_id);
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
SURFXML_START_TAG(route);
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)
- {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;}
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
/* Check user stupidities */
if (max < min)
- THROW2(arg_error, 0, "random->max < random->min (%f < %f)", max, min);
+ THROWF(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,
+ THROWF(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,
+ THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean,
max);
/* normalize the mean and standard deviation before storing */
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)",
+ THROWF(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'",
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);
+ xbt_assert(!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_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));
+ xbt_assert(!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);
