namespace simgrid {
namespace surf {
-void AsGeneric::parseRoute(sg_platf_route_cbarg_t /*route*/){
- THROW_IMPOSSIBLE;
-}
-
-void AsGeneric::parseASroute(sg_platf_route_cbarg_t /*route*/){
- THROW_IMPOSSIBLE;
-}
-
-void AsGeneric::getRouteAndLatency(NetCard */*src*/, NetCard */*dst*/, sg_platf_route_cbarg_t /*into*/, double */*latency*/){
- THROW_IMPOSSIBLE;
-}
-
AsGeneric::AsGeneric(const char*name)
: AsNone(name)
{
- p_bypassRoutes = xbt_dict_new_homogeneous((void (*)(void *)) routing_route_free);
+ bypassRoutes_ = xbt_dict_new_homogeneous((void (*)(void *)) routing_route_free);
}
AsGeneric::~AsGeneric()
{
- xbt_dict_free(&p_bypassRoutes);
-}
-
-int AsGeneric::parsePU(NetCard *elm)
-{
- XBT_DEBUG("Load process unit \"%s\"", elm->getName());
- xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm);
- return xbt_dynar_length(p_indexNetworkElm)-1;
-}
-
-int AsGeneric::parseAS(NetCard *elm)
-{
- XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName());
- xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm);
- return xbt_dynar_length(p_indexNetworkElm)-1;
+ xbt_dict_free(&bypassRoutes_);
}
void AsGeneric::parseBypassroute(sg_platf_route_cbarg_t e_route)
XBT_DEBUG("Load bypassASroute from \"%s\" to \"%s\"", src, dst);
else
XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst);
- xbt_dict_t dict_bypassRoutes = p_bypassRoutes;
+ xbt_dict_t dict_bypassRoutes = bypassRoutes_;
char *route_name;
route_name = bprintf("%s#%s", src, dst);
src, dst);
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->gw_src->getName(), dst, e_route->gw_dst->getName());
+ src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
sg_platf_route_cbarg_t new_e_route = NULL;
if(e_route->gw_dst)
void AsGeneric::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)
{
int src, dst;
- int table_size = xbt_dynar_length(p_indexNetworkElm);
+ int table_size = xbt_dynar_length(vertices_);
for (src = 0; src < table_size; src++) {
NetCard *my_src =
- xbt_dynar_get_as(p_indexNetworkElm, src, NetCard*);
+ xbt_dynar_get_as(vertices_, src, NetCard*);
for (dst = 0; dst < table_size; dst++) {
if (src == dst)
continue;
NetCard *my_dst =
- xbt_dynar_get_as(p_indexNetworkElm, dst, NetCard*);
+ xbt_dynar_get_as(vertices_, dst, NetCard*);
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+ route->link_list = xbt_dynar_new(sizeof(Link*), NULL);
getRouteAndLatency(my_src, my_dst, route, NULL);
- XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->getName(), my_dst->getName());
+ XBT_DEBUG ("get_route_and_latency %s -> %s", my_src->name(), my_dst->name());
unsigned int cpt;
void *link;
const char *previous_name, *current_name;
if (route->gw_src) {
- previous = new_xbt_graph_node(graph, route->gw_src->getName(), nodes);
- previous_name = route->gw_src->getName();
+ previous = new_xbt_graph_node(graph, route->gw_src->name(), nodes);
+ previous_name = route->gw_src->name();
} else {
- previous = new_xbt_graph_node(graph, my_src->getName(), nodes);
- previous_name = my_src->getName();
+ previous = new_xbt_graph_node(graph, my_src->name(), nodes);
+ previous_name = my_src->name();
}
xbt_dynar_foreach(route->link_list, cpt, link) {
}
if (route->gw_dst) {
- current = new_xbt_graph_node(graph, route->gw_dst->getName(), nodes);
- current_name = route->gw_dst->getName();
+ current = new_xbt_graph_node(graph, route->gw_dst->name(), nodes);
+ current_name = route->gw_dst->name();
} else {
- current = new_xbt_graph_node(graph, my_dst->getName(), nodes);
- current_name = my_dst->getName();
+ current = new_xbt_graph_node(graph, my_dst->name(), nodes);
+ current_name = my_dst->name();
}
new_xbt_graph_edge(graph, previous, current, edges);
XBT_DEBUG (" %s -> %s", previous_name, current_name);
double *lat)
{
// If never set a bypass route return NULL without any further computations
- XBT_DEBUG("generic_get_bypassroute from %s to %s", src->getName(), dst->getName());
+ XBT_DEBUG("generic_get_bypassroute from %s to %s", src->name(), dst->name());
if (no_bypassroute_declared)
return NULL;
sg_platf_route_cbarg_t e_route_bypass = NULL;
- xbt_dict_t dict_bypassRoutes = p_bypassRoutes;
+ xbt_dict_t dict_bypassRoutes = bypassRoutes_;
- if(dst->getRcComponent() == this && src->getRcComponent() == this ){
- char *route_name = bprintf("%s#%s", src->getName(), dst->getName());
+ if(dst->containingAS() == this && src->containingAS() == this ){
+ char *route_name = bprintf("%s#%s", src->name(), dst->name());
e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name);
if(e_route_bypass)
XBT_DEBUG("Find bypass route with %ld links",xbt_dynar_length(e_route_bypass->link_list));
if (src == NULL || dst == NULL)
xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
- src ? src->getName() : "(null)",
- dst ? dst->getName() : "(null)", p_name);
+ src ? src->name() : "(null)",
+ dst ? dst->name() : "(null)", name_);
- src_as = src->getRcComponent();
- dst_as = dst->getRcComponent();
+ src_as = src->containingAS();
+ dst_as = dst->containingAS();
/* (2) find the path to the root routing component */
path_src = xbt_dynar_new(sizeof(As*), NULL);
current = src_as;
while (current != NULL) {
xbt_dynar_push(path_src, ¤t);
- current = current->p_routingFather;
+ current = current->father_;
}
path_dst = xbt_dynar_new(sizeof(As*), NULL);
current = dst_as;
while (current != NULL) {
xbt_dynar_push(path_dst, ¤t);
- current = current->p_routingFather;
+ current = current->father_;
}
/* (3) find the common father */
if (i <= max_index_src && max <= max_index_dst) {
char *route_name = bprintf("%s#%s",
(*(As **)
- (xbt_dynar_get_ptr(path_src, i)))->p_name,
+ (xbt_dynar_get_ptr(path_src, i)))->name_,
(*(As **)
- (xbt_dynar_get_ptr(path_dst, max)))->p_name);
+ (xbt_dynar_get_ptr(path_dst, max)))->name_);
e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name);
xbt_free(route_name);
}
if (max <= max_index_src && i <= max_index_dst) {
char *route_name = bprintf("%s#%s",
(*(As **)
- (xbt_dynar_get_ptr(path_src, max)))->p_name,
+ (xbt_dynar_get_ptr(path_src, max)))->name_,
(*(As **)
- (xbt_dynar_get_ptr(path_dst, i)))->p_name);
+ (xbt_dynar_get_ptr(path_dst, i)))->name_);
e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name);
xbt_free(route_name);
}
if (max <= max_index_src && max <= max_index_dst) {
char *route_name = bprintf("%s#%s",
(*(As **)
- (xbt_dynar_get_ptr(path_src, max)))->p_name,
+ (xbt_dynar_get_ptr(path_src, max)))->name_,
(*(As **)
- (xbt_dynar_get_ptr(path_dst, max)))->p_name);
+ (xbt_dynar_get_ptr(path_dst, max)))->name_);
e_route_bypass = (sg_platf_route_cbarg_t) xbt_dict_get_or_null(dict_bypassRoutes, route_name);
xbt_free(route_name);
}
new_e_route->gw_src = e_route_bypass->gw_src;
new_e_route->gw_dst = e_route_bypass->gw_dst;
new_e_route->link_list =
- xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+ xbt_dynar_new(sizeof(Link*), NULL);
xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) {
xbt_dynar_push(new_e_route->link_list, &link);
if (lat)
unsigned int cpt;
result = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- result->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+ result->link_list = xbt_dynar_new(sizeof(Link*), NULL);
xbt_assert(hierarchy == SURF_ROUTING_BASE
|| hierarchy == SURF_ROUTING_RECURSIVE,
if (hierarchy == SURF_ROUTING_RECURSIVE) {
- xbt_assert(routearg->gw_src && routearg->gw_dst,
- "NULL is obviously a bad gateway");
+ xbt_assert(routearg->gw_src && routearg->gw_dst, "NULL is obviously a deficient gateway");
/* remember not erase the gateway names */
result->gw_src = routearg->gw_src;
return result;
}
-void AsGeneric::srcDstCheck(NetCard *src, NetCard *dst)
+void AsGeneric::getRouteCheckParams(NetCard *src, NetCard *dst)
{
- if (src == NULL || dst == NULL)
- xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
- src ? src->getName() : "(null)",
- dst ? dst->getName() : "(null)",
- p_name);
-
- As *src_as = src->getRcComponent();
- As *dst_as = dst->getRcComponent();
-
- if (src_as != dst_as)
- xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS",
- src->getName(), src_as->p_name,
- dst->getName(), dst_as->p_name);
-
- if (this != dst_as)
- xbt_die
- ("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)",
- src->getName(),
- dst->getName(),
- src_as->p_name,
- dst_as->p_name,
- p_name);
+ xbt_assert(src,"Cannot find a route from NULL to %s", dst->name());
+ xbt_assert(dst,"Cannot find a route from %s to NULL", src->name());
+
+ As *src_as = src->containingAS();
+ As *dst_as = dst->containingAS();
+
+ xbt_assert(src_as == dst_as, "Internal error: %s@%s and %s@%s are not in the same AS as expected. Please report that bug.",
+ src->name(), src_as->name_, dst->name(), dst_as->name_);
+
+ xbt_assert(this == dst_as,
+ "Internal error: route destination %s@%s is not in AS %s as expected (route source: %s@%s). Please report that bug.",
+ src->name(), dst->name(), src_as->name_, dst_as->name_, name_);
+}
+void AsGeneric::parseRouteCheckParams(sg_platf_route_cbarg_t route) {
+ const char *srcName = route->src;
+ const char *dstName = route->dst;
+ NetCard *src = sg_netcard_by_name_or_null(srcName);
+ NetCard *dst = sg_netcard_by_name_or_null(dstName);
+
+ if(!route->gw_dst && !route->gw_src) {
+ XBT_DEBUG("Load Route from \"%s\" to \"%s\"", srcName, dstName);
+ xbt_assert(src, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, srcName);
+ xbt_assert(dst, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, dstName);
+ xbt_assert(!xbt_dynar_is_empty(route->link_list), "Empty route (between %s and %s) forbidden.", srcName, dstName);
+ xbt_assert(src->getRcType()==SURF_NETWORK_ELEMENT_HOST || src->getRcType()==SURF_NETWORK_ELEMENT_ROUTER,
+ "When defining a route, src must be an host or a router but '%s' is not. Did you meant to have an ASroute?", srcName);
+ xbt_assert(dst->getRcType()==SURF_NETWORK_ELEMENT_HOST || dst->getRcType()==SURF_NETWORK_ELEMENT_ROUTER,
+ "When defining a route, dst must be an host or a router but '%s' is not. Did you meant to have an ASroute?", dstName);
+ } else {
+ XBT_DEBUG("Load ASroute from %s@%s to %s@%s", srcName, route->gw_src->name(), dstName, route->gw_dst->name());
+ xbt_assert(src->getRcType()==SURF_NETWORK_ELEMENT_AS,
+ "When defining an ASroute, src must be an AS but '%s' is not", srcName);
+ xbt_assert(dst->getRcType()==SURF_NETWORK_ELEMENT_AS,
+ "When defining an ASroute, dst must be an AS but '%s' is not", dstName);
+
+ xbt_assert(route->gw_src->getRcType()==SURF_NETWORK_ELEMENT_HOST || route->gw_src->getRcType()==SURF_NETWORK_ELEMENT_ROUTER,
+ "When defining an ASroute, gw_src must be an host or a router but '%s' is not.", srcName);
+ xbt_assert(route->gw_dst->getRcType()==SURF_NETWORK_ELEMENT_HOST || route->gw_dst->getRcType()==SURF_NETWORK_ELEMENT_ROUTER,
+ "When defining an ASroute, gw_dst must be an host or a router but '%s' is not.", dstName);
+
+ xbt_assert(route->gw_src != route->gw_dst, "Cannot define an ASroute from '%s' to itself", route->gw_src->name());
+
+ xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.",
+ srcName,route->gw_src->name(), dstName,route->gw_dst->name(), srcName);
+ xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.",
+ srcName,route->gw_src->name(), dstName,route->gw_dst->name(), dstName);
+ xbt_assert(!xbt_dynar_is_empty(route->link_list), "Empty route (between %s@%s and %s@%s) forbidden.",
+ srcName,route->gw_src->name(), dstName,route->gw_dst->name());
+ }
}
}
