AS_t current_routing = NULL;
/* global parse functions */
-xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */
+xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */
static const char *src = NULL; /* temporary store the source name of a route */
static const char *dst = NULL; /* temporary store the destination name of a route */
static char *gw_src = NULL; /* temporary store the gateway source name of a route */
info->rc_type = SURF_NETWORK_ELEMENT_HOST;
xbt_lib_set(host_lib, host->id, ROUTING_HOST_LEVEL, (void *) info);
if (host->coord && strcmp(host->coord, "")) {
+ unsigned int cursor;
+ char*str;
+
if (!COORD_HOST_LEVEL)
- xbt_die
- ("To use host coordinates, please add --cfg=coordinates:yes to your command line");
- xbt_dynar_t ctn = xbt_str_split_str(host->coord, " ");
+ xbt_die ("To use host coordinates, please add --cfg=coordinates:yes to your command line");
+
+ /* Pre-parse the host coordinates -- FIXME factorize with routers by overloading the routing->parse_PU function*/
+ xbt_dynar_t ctn_str = xbt_str_split_str(host->coord, " ");
+ xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL);
+ xbt_dynar_foreach(ctn_str,cursor, str) {
+ double val = atof(str);
+ xbt_dynar_push(ctn,&val);
+ }
xbt_dynar_shrink(ctn, 0);
+ xbt_dynar_free(&ctn_str);
xbt_lib_set(host_lib, host->id, COORD_HOST_LEVEL, (void *) ctn);
}
}
xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info);
if (strcmp(router->coord, "")) {
+ unsigned int cursor;
+ char*str;
+
if (!COORD_ASR_LEVEL)
- xbt_die
- ("To use coordinates, you must set configuration 'coordinates' to 'yes'");
- xbt_dynar_t ctn = xbt_str_split_str(router->coord, " ");
+ xbt_die ("To use host coordinates, please add --cfg=coordinates:yes to your command line");
+
+ /* Pre-parse the host coordinates */
+ xbt_dynar_t ctn_str = xbt_str_split_str(router->coord, " ");
+ xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL);
+ xbt_dynar_foreach(ctn_str,cursor, str) {
+ double val = atof(str);
+ xbt_dynar_push(ctn,&val);
+ }
xbt_dynar_shrink(ctn, 0);
+ xbt_dynar_free(&ctn_str);
xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn);
}
}
*/
static void routing_parse_S_route(void)
{
- if (src != NULL && dst != NULL && link_list != NULL)
+ if (src != NULL && dst != NULL && parsed_link_list != NULL)
THROWF(arg_error, 0, "Route between %s to %s can not be defined",
A_surfxml_route_src, A_surfxml_route_dst);
src = A_surfxml_route_src;
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);
+ parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
/**
*/
static void routing_parse_S_ASroute(void)
{
- if (src != NULL && dst != NULL && link_list != NULL)
+ if (src != NULL && dst != NULL && parsed_link_list != NULL)
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;
|| strlen(gw_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);
+ parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
/**
*/
static void routing_parse_S_bypassRoute(void)
{
- if (src != NULL && dst != NULL && link_list != NULL)
+ if (src != NULL && dst != NULL && parsed_link_list != NULL)
THROWF(arg_error, 0,
"Bypass Route between %s to %s can not be defined",
A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst);
|| strlen(gw_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);
+ parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref);
}
/**
link_id = bprintf("%s_DOWN", A_surfxml_link_ctn_id);
break;
}
- xbt_dynar_push(link_list, &link_id);
+ xbt_dynar_push(parsed_link_list, &link_id);
}
/**
static void routing_parse_E_route(void)
{
route_t route = xbt_new0(s_route_t, 1);
- route->link_list = link_list;
+ route->link_list = parsed_link_list;
xbt_assert(current_routing->parse_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
current_routing->parse_route(current_routing, src, dst, route);
- link_list = NULL;
+ generic_free_route(route);
+ parsed_link_list = NULL;
src = NULL;
dst = NULL;
}
static void routing_parse_E_ASroute(void)
{
route_t e_route = xbt_new0(s_route_t, 1);
- e_route->link_list = link_list;
+ e_route->link_list = parsed_link_list;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
xbt_assert(current_routing->parse_ASroute,
"no defined method \"set_ASroute\" in \"%s\"",
current_routing->name);
current_routing->parse_ASroute(current_routing, src, dst, e_route);
- link_list = NULL;
+ generic_free_route(e_route);
+ parsed_link_list = NULL;
src = NULL;
dst = NULL;
gw_src = NULL;
static void routing_parse_E_bypassRoute(void)
{
route_t e_route = xbt_new0(s_route_t, 1);
- e_route->link_list = link_list;
+ e_route->link_list = parsed_link_list;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
xbt_assert(current_routing->parse_bypassroute,
"Bypassing mechanism not implemented by routing '%s'",
current_routing->name);
current_routing->parse_bypassroute(current_routing, src, dst, e_route);
- link_list = NULL;
+ parsed_link_list = NULL;
src = NULL;
dst = NULL;
gw_src = NULL;
*
* \param src the source host name
* \param dst the destination host name
- * \param *e_route the route where the links are stored
+ * \param *route the route where the links are stored. It is either NULL or a ready to use dynar
* \param *latency the latency, if needed
*
* This function is called by "get_route" and "get_latency". It allows to walk
- * recursively through the routing components tree.
+ * recursively through the ASes tree.
*/
static void _get_route_and_latency(const char *src, const char *dst,
- xbt_dynar_t * route, double *latency)
+ xbt_dynar_t * links, double *latency)
{
+ void *link;
+ unsigned int cpt;
+ s_route_t route;
+ memset(&route,0,sizeof(route));
+
XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src, dst);
xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");
- AS_t common_father;
- AS_t src_father;
- AS_t dst_father;
+ /* Find how src and dst are interconnected */
+ AS_t common_father, src_father, dst_father;
elements_father(src, dst, &common_father, &src_father, &dst_father);
+ /* If src and dst are in the same AS, life is good */
if (src_father == dst_father) { /* SURF_ROUTING_BASE */
- route_t e_route = NULL;
- if (route) {
- e_route = common_father->get_route(common_father, src, dst);
- xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst);
- *route = e_route->link_list;
- }
- if (latency) {
- *latency = common_father->get_latency(common_father, src, dst, e_route);
- xbt_assert(*latency >= 0.0,
- "latency error on route between \"%s\" and \"%s\"", src, dst);
- }
- if (e_route) {
- xbt_free(e_route->src_gateway);
- xbt_free(e_route->dst_gateway);
- xbt_free(e_route);
- }
-
- } else { /* SURF_ROUTING_RECURSIVE */
+ route.link_list = *links;
- route_t e_route_bypass = NULL;
- if (common_father->get_bypass_route)
- e_route_bypass = common_father->get_bypass_route(common_father, src, dst);
+ common_father->get_route_and_latency(common_father, src, dst, &route,latency);
- xbt_assert(!latency || !e_route_bypass,
- "Bypass cannot work yet with get_latency");
+ xbt_free(route.src_gateway);
+ xbt_free(route.dst_gateway);
+ return;
+ }
- route_t e_route_cnt = e_route_bypass
- ? e_route_bypass : common_father->get_route(common_father,
- src_father->name,
- dst_father->name);
+ /* If we are here, src and dst are not in the same AS; check whether a direct bypass is defined */
- xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"",
- src_father->name, dst_father->name);
+ route_t e_route_bypass = NULL;
+ if (common_father->get_bypass_route)
+ e_route_bypass = common_father->get_bypass_route(common_father, src, dst);
- 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 (e_route_bypass) { /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */
+ if (latency)
+ xbt_die("Bypass cannot work yet with get_latency"); // FIXME: get_bypass_route should update the latency itself, just like get_route
- if (route) {
- *route = xbt_dynar_new(global_routing->size_of_link, NULL);
- }
- if (latency) {
- *latency = common_father->get_latency(common_father,
- src_father->name, dst_father->name,
- e_route_cnt);
- xbt_assert(*latency >= 0.0,
- "latency error on route between \"%s\" and \"%s\"",
- src_father->name, dst_father->name);
+// // FIXME this path is never tested. I need examples to check the bypass mechanism...
+// THROW_UNIMPLEMENTED; // let's warn the users of the problem
+ xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) {
+ xbt_dynar_push(*links, &link);
}
- void *link;
- unsigned int cpt;
-
- if (strcmp(src, e_route_cnt->src_gateway)) {
- double latency_src;
- xbt_dynar_t route_src;
-
- _get_route_and_latency(src, e_route_cnt->src_gateway,
- (route ? &route_src : NULL),
- (latency ? &latency_src : NULL));
- if (route) {
- xbt_assert(route_src, "no route between \"%s\" and \"%s\"",
- src, e_route_cnt->src_gateway);
- xbt_dynar_foreach(route_src, cpt, link) {
- xbt_dynar_push(*route, &link);
- }
- xbt_dynar_free(&route_src);
- }
- if (latency) {
- xbt_assert(latency_src >= 0.0,
- "latency error on route between \"%s\" and \"%s\"",
- src, e_route_cnt->src_gateway);
- *latency += latency_src;
- }
- }
+ generic_free_route(e_route_bypass);
+ return;
+ }
- if (route) {
- xbt_dynar_foreach(e_route_cnt->link_list, cpt, link) {
- xbt_dynar_push(*route, &link);
- }
- }
- if (strcmp(e_route_cnt->dst_gateway, dst)) {
- double latency_dst;
- xbt_dynar_t route_dst;
-
- _get_route_and_latency(e_route_cnt->dst_gateway, dst,
- (route ? &route_dst : NULL),
- (latency ? &latency_dst : NULL));
- if (route) {
- xbt_assert(route_dst, "no route between \"%s\" and \"%s\"",
- e_route_cnt->dst_gateway, dst);
- xbt_dynar_foreach(route_dst, cpt, link) {
- xbt_dynar_push(*route, &link);
- }
- xbt_dynar_free(&route_dst);
- }
- if (latency) {
- xbt_assert(latency_dst >= 0.0,
- "latency error on route between \"%s\" and \"%s\"",
- e_route_cnt->dst_gateway, dst);
- *latency += latency_dst;
- }
- }
+ /* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/
+
+ route.link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
+ common_father->get_route_and_latency(common_father, src_father->name, dst_father->name, &route,latency);
- generic_free_route(e_route_cnt);
+ xbt_assert((route.src_gateway != NULL) && (route.dst_gateway != NULL),
+ "bad gateways for route from \"%s\" to \"%s\"", src, dst);
+
+ char*src_gateway = route.src_gateway;
+ char*dst_gateway = route.dst_gateway;
+
+ /* If source gateway is not our source, we have to recursively find our way up to this point */
+ if (strcmp(src, src_gateway))
+ _get_route_and_latency(src, src_gateway, links, latency);
+
+ xbt_dynar_foreach(route.link_list, cpt, link) {
+ xbt_dynar_push(*links, &link);
}
-}
-/**
- * \brief Generic function for get_route, get_route_no_cleanup, and get_latency
- */
-void routing_get_route_and_latency(const char *src, const char *dst,
- xbt_dynar_t * route, double *latency, int cleanup)
-{
- static xbt_dynar_t last_route = NULL;
+ /* If dest gateway is not our destination, we have to recursively find our way from this point */
+ // FIXME why can't I factorize it the same way than [src;src_gw] without breaking the examples??
+ if (strcmp(dst_gateway, dst)) {
+ xbt_dynar_t route_dst = xbt_dynar_new(global_routing->size_of_link,NULL);
- _get_route_and_latency(src, dst, route, latency);
- xbt_assert(!route || *route, "no route between \"%s\" and \"%s\"", src, dst);
- xbt_assert(!latency || *latency >= 0.0,
- "latency error on route between \"%s\" and \"%s\"", src, dst);
- if (route) {
- xbt_dynar_free(&last_route);
- last_route = cleanup ? *route : NULL;
+ _get_route_and_latency(dst_gateway, dst, &route_dst, latency);
+
+ xbt_dynar_foreach(route_dst, cpt, link) {
+ xbt_dynar_push(*links, &link);
+ }
+ xbt_dynar_free(&route_dst);
}
-}
-/**
- * \brief Find a route between hosts
- *
- * \param src the source host name
- * \param dst the destination host name
- *
- * walk through the routing components tree and find a route between hosts
- * by calling the differents "get_route" functions in each routing component.
- * No need to free the returned dynar. It will be freed at the next call.
- */
-xbt_dynar_t routing_get_route(const char *src, const char *dst) {
- xbt_dynar_t route = NULL;
- routing_get_route_and_latency(src, dst, &route, NULL, 1);
- return route;
+ xbt_free(src_gateway);
+ xbt_free_f(dst_gateway);
+ xbt_dynar_free(&route.link_list);
}
/**
- * \brief Generic method: find a route between hosts
+ * \brief Find a route between hosts
*
* \param src the source host name
* \param dst the destination host name
+ * \param route where to store the list of links.
+ * If *route=NULL, create a short lived dynar. Else, fill the provided dynar
+ * \param latency where to store the latency experienced on the path (or NULL if not interested)
+ * It is the caller responsability to initialize latency to 0 (we add to provided route)
+ * \pre route!=NULL
*
* walk through the routing components tree and find a route between hosts
* by calling the differents "get_route" functions in each routing component.
- * Leaves the caller the responsability to clean the returned dynar.
*/
-static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst)
+void routing_get_route_and_latency(const char *src, const char *dst,
+ xbt_dynar_t * route, double *latency)
{
- xbt_dynar_t route = NULL;
- routing_get_route_and_latency(src, dst, &route, NULL, 0);
- return route;
+ if (!*route) {
+ xbt_dynar_reset(global_routing->last_route);
+ *route = global_routing->last_route;
+ }
+
+ _get_route_and_latency(src, dst, route, latency);
+
+ xbt_assert(!latency || *latency >= 0.0,
+ "negative latency on route between \"%s\" and \"%s\"", src, dst);
}
static xbt_dynar_t recursive_get_onelink_routes(AS_t rc)
/* config the uniq global routing */
global_routing = xbt_new0(s_routing_global_t, 1);
global_routing->root = NULL;
- global_routing->get_route_no_cleanup = get_route_no_cleanup;
global_routing->get_onelink_routes = get_onelink_routes;
global_routing->loopback = loopback;
global_routing->size_of_link = size_of_links;
+ global_routing->last_route = xbt_dynar_new(global_routing->size_of_link,NULL);
/* no current routing at moment */
current_routing = NULL;
}
if (strcmp(cluster->availability_trace, "")
|| strcmp(cluster->state_trace, "")) {
- patterns = xbt_dict_new();
- xbt_dict_set(patterns, "id", xbt_strdup(cluster->id), free);
- xbt_dict_set(patterns, "prefix", xbt_strdup(cluster->prefix), free);
- xbt_dict_set(patterns, "suffix", xbt_strdup(cluster->suffix), free);
+ patterns = xbt_dict_new_homogeneous(xbt_free_f);
+ xbt_dict_set(patterns, "id", xbt_strdup(cluster->id), NULL);
+ xbt_dict_set(patterns, "prefix", xbt_strdup(cluster->prefix), NULL);
+ xbt_dict_set(patterns, "suffix", xbt_strdup(cluster->suffix), NULL);
}
memset(&host, 0, sizeof(host));
host.id = host_id;
if (strcmp(cluster->availability_trace, "")) {
- xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
+ xbt_dict_set(patterns, "radical", bprintf("%d", i), NULL);
char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns);
XBT_DEBUG("\tavailability_file=\"%s\"", avail_file);
host.power_trace = tmgr_trace_new(avail_file);
host.power_trace = peer->availability_trace;
host.state_trace = peer->state_trace;
host.core_amount = 1;
+ host.coord = peer->coord;
sg_platf_new_host(&host);
int start, end;
xbt_dynar_t radical_ends;
- random->generator = A_surfxml_random_generator;
+ switch (A_surfxml_random_generator) {
+ case AU_surfxml_random_generator:
+ case A_surfxml_random_generator_NONE:
+ random->generator = NONE;
+ break;
+ case A_surfxml_random_generator_DRAND48:
+ random->generator = DRAND48;
+ break;
+ case A_surfxml_random_generator_RAND:
+ random->generator = RAND;
+ break;
+ case A_surfxml_random_generator_RNGSTREAM:
+ random->generator = RNGSTREAM;
+ break;
+ default:
+ surf_parse_error("Invalid random generator");
+ break;
+ }
random->seed = seed;
random->min = min;
random->max = max;
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);
+ (int)random->generator, random->seed, random_radical);
if (!random_value)
- random_value = xbt_dict_new();
+ random_value = xbt_dict_new_homogeneous(free);
if (!strcmp(random_radical, "")) {
res = random_generate(random);
rd_value = bprintf("%f", res);
- xbt_dict_set(random_value, random_id, rd_value, free);
+ xbt_dict_set(random_value, random_id, rd_value, NULL);
} else {
radical_elements = xbt_str_split(random_radical, ",");
xbt_dynar_foreach(radical_elements, iter, groups) {
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_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL);
xbt_free(tmpbuf);
break;
i));
res = random_generate(random);
tmpbuf = bprintf("%s%d", random_id, i);
- xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), free);
+ xbt_dict_set(random_value, tmpbuf, bprintf("%f", res), NULL);
xbt_free(tmpbuf);
}
break;
default:
- XBT_INFO("Malformed radical");
+ XBT_CRITICAL("Malformed radical");
break;
}
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_dict_set(random_value, rd_name, rd_value, NULL);
xbt_dynar_free(&radical_ends);
}
void routing_exit(void) {
if (!global_routing)
return;
+ xbt_dynar_free(&global_routing->last_route);
finalize_rec(global_routing->root);
xbt_free(global_routing);
}
