int SIMIX_HOST_LEVEL; //Simix level
int MSG_HOST_LEVEL; //Msg level
int SD_HOST_LEVEL; //Simdag level
-int COORD_HOST_LEVEL; //Coordinates level
+int COORD_HOST_LEVEL=0; //Coordinates level
int NS3_HOST_LEVEL; //host node for ns3
xbt_lib_t link_lib;
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 coordinates, you must set configuration 'coordinates' to 'yes'");
- 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_E_route(void)
{
- route_extended_t route = xbt_new0(s_route_extended_t, 1);
- route->generic_route.link_list = link_list;
+ route_t route = xbt_new0(s_route_t, 1);
+ route->link_list = link_list;
xbt_assert(current_routing->parse_route,
"no defined method \"set_route\" in \"%s\"",
current_routing->name);
*/
static void routing_parse_E_ASroute(void)
{
- route_extended_t e_route = xbt_new0(s_route_extended_t, 1);
- e_route->generic_route.link_list = link_list;
+ route_t e_route = xbt_new0(s_route_t, 1);
+ e_route->link_list = link_list;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
xbt_assert(current_routing->parse_ASroute,
*/
static void routing_parse_E_bypassRoute(void)
{
- route_extended_t e_route = xbt_new0(s_route_extended_t, 1);
- e_route->generic_route.link_list = link_list;
+ route_t e_route = xbt_new0(s_route_t, 1);
+ e_route->link_list = link_list;
e_route->src_gateway = xbt_strdup(gw_src);
e_route->dst_gateway = xbt_strdup(gw_dst);
xbt_assert(current_routing->parse_bypassroute,
*
* \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)
{
+ void *link;
+ unsigned int cpt;
+
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_extended_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->generic_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);
- }
+ route_t e_route = xbt_new0(s_route_t, 1);
+ e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
- } else { /* SURF_ROUTING_RECURSIVE */
+ common_father->get_route(common_father, src, dst, e_route);
+ *route = e_route->link_list;
- 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);
+ if (latency)
+ *latency += common_father->get_latency(common_father, src, dst, e_route);
- xbt_assert(!latency || !e_route_bypass,
- "Bypass cannot work yet with get_latency");
+ xbt_free(e_route->src_gateway);
+ xbt_free(e_route->dst_gateway);
+ xbt_free(e_route);
+ return;
+ }
- route_extended_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: that limitation seems supurious to me -- check with alvin
- 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);
- }
+ *route = xbt_dynar_new(global_routing->size_of_link, NULL);
- 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;
- }
+ xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) {
+ xbt_dynar_push(*route, &link);
}
- if (route) {
- xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) {
- xbt_dynar_push(*route, &link);
- }
- }
+ generic_free_route(e_route_bypass);
+ return;
+ }
- 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_t e_route_cnt = xbt_new0(s_route_t, 1);
+ e_route_cnt->link_list = xbt_dynar_new(global_routing->size_of_link, NULL);
+ common_father->get_route(common_father, src_father->name, dst_father->name, e_route_cnt);
+
+ xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"",
+ src_father->name, dst_father->name);
+
+ xbt_assert((e_route_cnt->src_gateway == NULL) ==
+ (e_route_cnt->dst_gateway == NULL),
+ "bad gateway for route between \"%s\" and \"%s\"", src, dst);
+
+ *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);
+ }
+
+
+ /* If source gateway is not our source, we have to recursively find our way up to this point */
+ if (strcmp(src, e_route_cnt->src_gateway)) {
+ xbt_dynar_t route_src;
+
+ _get_route_and_latency(src, e_route_cnt->src_gateway,
+ (route ? &route_src : NULL),
+ latency);
+
+ xbt_dynar_foreach(route_src, cpt, link) {
+ xbt_dynar_push(*route, &link);
}
+ xbt_dynar_free(&route_src);
+ }
- generic_free_extended_route(e_route_cnt);
+ xbt_dynar_foreach(e_route_cnt->link_list, cpt, link) {
+ xbt_dynar_push(*route, &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 */
+ if (strcmp(e_route_cnt->dst_gateway, dst)) {
+ xbt_dynar_t route_dst;
+
+ _get_route_and_latency(e_route_cnt->dst_gateway, dst,
+ (route ? &route_dst : NULL),
+ latency);
+
+ xbt_dynar_foreach(route_dst, cpt, link) {
+ xbt_dynar_push(*route, &link);
+ }
+ xbt_dynar_free(&route_dst);
- _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;
}
-}
-/**
- * \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;
+ generic_free_route(e_route_cnt);
}
/**
- * \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;
+ static xbt_dynar_t last_route = NULL;
+
+ int need_cleanup = !(*route);
+
+ if (need_cleanup) {
+ xbt_dynar_free(&last_route);
+ last_route = *route = xbt_dynar_new(global_routing->size_of_link,NULL);
+ }
+
+ _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;
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);
}
break;
default:
- XBT_INFO("Malformed radical");
+ XBT_CRITICAL("Malformed radical");
break;
}
res = random_generate(random);
