#include "src/surf/platform.hpp"
#include "surf/surfxml_parse_values.h"
-/*************
- * Callbacks *
- *************/
+#include "src/surf/surf_routing_cluster_torus.hpp"
+#include "src/surf/surf_routing_cluster_fat_tree.hpp"
+#include "src/surf/surf_routing_dijkstra.hpp"
+#include "src/surf/surf_routing_floyd.hpp"
+#include "src/surf/surf_routing_full.hpp"
+#include "src/surf/surf_routing_vivaldi.hpp"
+
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
namespace simgrid {
namespace surf {
-simgrid::xbt::signal<void(simgrid::surf::NetCard*)> netcardCreatedCallbacks;
-simgrid::xbt::signal<void(simgrid::surf::As*)> asCreatedCallbacks;
+ /* Callbacks */
+ simgrid::xbt::signal<void(simgrid::surf::NetCard*)> netcardCreatedCallbacks;
+ simgrid::xbt::signal<void(simgrid::surf::As*)> asCreatedCallbacks;
+
+ As::As(const char*name)
+ : name_(xbt_strdup(name))
+ {}
+ As::~As()
+ {
+ xbt_dict_free(&sons_);
+ xbt_dynar_free(&vertices_);
+ xbt_dynar_free(&upDownLinks);
+ xbt_free(name_);
+ if (netcard_)
+ delete netcard_;
+ }
+
+ sg_platf_route_cbarg_t As::getBypassRoute(NetCard * /*src*/, NetCard * /*dst*/, double * /*lat*/) {
+ return NULL;
+ }
-}
-}
+
+ int As::addComponent(NetCard *elm) {
+ XBT_DEBUG("Load component \"%s\"", elm->name());
+ xbt_dynar_push_as(vertices_, NetCard*, elm);
+ return xbt_dynar_length(vertices_)-1;
+ }
+
+ void As::parseRoute(sg_platf_route_cbarg_t /*route*/){
+ THROW_IMPOSSIBLE; /* No. */
+ }
+ void As::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){
+ THROW_IMPOSSIBLE;
+ }
+
+}} // namespace simgrid::surf
/**
* @ingroup SURF_build_api
/* Global vars */
simgrid::surf::RoutingPlatf *routing_platf = NULL;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
/** The current AS in the parsing */
static simgrid::surf::As *current_routing = NULL;
return current_routing;
}
-/* this lines are only for replace use like index in the model table */
-typedef enum {
- SURF_MODEL_FULL = 0,
- SURF_MODEL_FLOYD,
- SURF_MODEL_DIJKSTRA,
- SURF_MODEL_DIJKSTRACACHE,
- SURF_MODEL_NONE,
- SURF_MODEL_VIVALDI,
- SURF_MODEL_CLUSTER,
- SURF_MODEL_TORUS_CLUSTER,
- SURF_MODEL_FAT_TREE_CLUSTER,
-} e_routing_types;
-
-struct s_model_type routing_models[] = {
- {"Full",
- "Full routing data (fast, large memory requirements, fully expressive)",
- model_full_create},
- {"Floyd",
- "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)",
- model_floyd_create},
- {"Dijkstra",
- "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)",
- model_dijkstra_create},
- {"DijkstraCache",
- "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)",
- model_dijkstracache_create},
- {"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).",
- model_none_create},
- {"Vivaldi", "Vivaldi routing", model_vivaldi_create},
- {"Cluster", "Cluster routing", model_cluster_create},
- {"TorusCluster", "Torus Cluster routing", model_torus_cluster_create},
- {"FatTreeCluster", "Fat Tree Cluster routing", model_fat_tree_cluster_create},
- {NULL, NULL, NULL}
-};
-
-/**
- * \brief Add a netcard connecting an host to the network element list
- * FIXME: integrate into host constructor
- */
-void sg_platf_new_netcard(sg_platf_host_link_cbarg_t netcard)
+/** @brief Add a link connecting an host to the rest of its AS (which must be cluster or vivaldi) */
+void sg_platf_new_hostlink(sg_platf_host_link_cbarg_t netcard_arg)
{
- simgrid::surf::NetCard *info = sg_host_by_name(netcard->id)->pimpl_netcard;
- xbt_assert(info, "Host '%s' not found!", netcard->id);
- xbt_assert(current_routing->p_modelDesc == &routing_models[SURF_MODEL_CLUSTER] ||
- current_routing->p_modelDesc == &routing_models[SURF_MODEL_VIVALDI],
- "You have to be in model Cluster to use tag host_link!");
+ simgrid::surf::NetCard *netcard = sg_host_by_name(netcard_arg->id)->pimpl_netcard;
+ xbt_assert(netcard, "Host '%s' not found!", netcard_arg->id);
+ xbt_assert(dynamic_cast<simgrid::surf::AsCluster*>(current_routing) ||
+ dynamic_cast<simgrid::surf::AsVivaldi*>(current_routing),
+ "Only hosts from Cluster and Vivaldi ASes can get a host_link.");
s_surf_parsing_link_up_down_t link_up_down;
- link_up_down.link_up = Link::byName(netcard->link_up);
- link_up_down.link_down = Link::byName(netcard->link_down);
+ link_up_down.link_up = Link::byName(netcard_arg->link_up);
+ link_up_down.link_down = Link::byName(netcard_arg->link_down);
- xbt_assert(link_up_down.link_up, "Link '%s' not found!",netcard->link_up);
- xbt_assert(link_up_down.link_down, "Link '%s' not found!",netcard->link_down);
+ xbt_assert(link_up_down.link_up, "Link '%s' not found!",netcard_arg->link_up);
+ xbt_assert(link_up_down.link_down, "Link '%s' not found!",netcard_arg->link_down);
// If dynar is is greater than netcard id and if the host_link is already defined
- if((int)xbt_dynar_length(current_routing->p_linkUpDownList) > info->getId() &&
- xbt_dynar_get_as(current_routing->p_linkUpDownList, info->getId(), void*))
- surf_parse_error("Host_link for '%s' is already defined!",netcard->id);
+ if((int)xbt_dynar_length(current_routing->upDownLinks) > netcard->id() &&
+ xbt_dynar_get_as(current_routing->upDownLinks, netcard->id(), void*))
+ surf_parse_error("Host_link for '%s' is already defined!",netcard_arg->id);
- XBT_DEBUG("Push Host_link for host '%s' to position %d", info->getName(), info->getId());
- xbt_dynar_set_as(current_routing->p_linkUpDownList, info->getId(), s_surf_parsing_link_up_down_t, link_up_down);
+ XBT_DEBUG("Push Host_link for host '%s' to position %d", netcard->name(), netcard->id());
+ xbt_dynar_set_as(current_routing->upDownLinks, netcard->id(), s_surf_parsing_link_up_down_t, link_up_down);
}
void sg_platf_new_trace(sg_platf_trace_cbarg_t trace)
void routing_AS_begin(sg_platf_AS_cbarg_t AS)
{
XBT_DEBUG("routing_AS_begin");
- routing_model_description_t model = NULL;
xbt_assert(NULL == xbt_lib_get_or_null(as_router_lib, AS->id, ROUTING_ASR_LEVEL),
"Refusing to create a second AS called \"%s\".", AS->id);
- _sg_cfg_init_status = 2; /* horrible hack: direct access to the global
- * controlling the level of configuration to prevent
- * any further config */
+ _sg_cfg_init_status = 2; /* HACK: direct access to the global controlling the level of configuration to prevent
+ * any further config now that we created some real content */
+
/* search the routing model */
+ simgrid::surf::As *new_as = NULL;
switch(AS->routing){
- case A_surfxml_AS_routing_Cluster: model = &routing_models[SURF_MODEL_CLUSTER];break;
- case A_surfxml_AS_routing_ClusterTorus: model = &routing_models[SURF_MODEL_TORUS_CLUSTER];break;
- case A_surfxml_AS_routing_ClusterFatTree: model = &routing_models[SURF_MODEL_FAT_TREE_CLUSTER];break;
- case A_surfxml_AS_routing_Dijkstra: model = &routing_models[SURF_MODEL_DIJKSTRA];break;
- case A_surfxml_AS_routing_DijkstraCache: model = &routing_models[SURF_MODEL_DIJKSTRACACHE];break;
- case A_surfxml_AS_routing_Floyd: model = &routing_models[SURF_MODEL_FLOYD];break;
- case A_surfxml_AS_routing_Full: model = &routing_models[SURF_MODEL_FULL];break;
- case A_surfxml_AS_routing_None: model = &routing_models[SURF_MODEL_NONE];break;
- case A_surfxml_AS_routing_Vivaldi: model = &routing_models[SURF_MODEL_VIVALDI];break;
- default: xbt_die("Not a valid model!!!");
- break;
+ case A_surfxml_AS_routing_Cluster: new_as = new simgrid::surf::AsCluster(AS->id); break;
+ case A_surfxml_AS_routing_ClusterTorus: new_as = new simgrid::surf::AsClusterTorus(AS->id); break;
+ case A_surfxml_AS_routing_ClusterFatTree: new_as = new simgrid::surf::AsClusterFatTree(AS->id); break;
+ case A_surfxml_AS_routing_Dijkstra: new_as = new simgrid::surf::AsDijkstra(AS->id, 0); break;
+ case A_surfxml_AS_routing_DijkstraCache: new_as = new simgrid::surf::AsDijkstra(AS->id, 1); break;
+ case A_surfxml_AS_routing_Floyd: new_as = new simgrid::surf::AsFloyd(AS->id); break;
+ case A_surfxml_AS_routing_Full: new_as = new simgrid::surf::AsFull(AS->id); break;
+ case A_surfxml_AS_routing_None: new_as = new simgrid::surf::AsNone(AS->id); break;
+ case A_surfxml_AS_routing_Vivaldi: new_as = new simgrid::surf::AsVivaldi(AS->id); break;
+ default: xbt_die("Not a valid model!"); break;
}
/* make a new routing component */
- simgrid::surf::As *new_as = model->create();
-
- new_as->p_modelDesc = model;
- new_as->p_hierarchy = SURF_ROUTING_NULL;
- new_as->p_name = xbt_strdup(AS->id);
-
- simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->p_name, SURF_NETWORK_ELEMENT_AS, current_routing);
- if (current_routing == NULL && routing_platf->p_root == NULL) {
+ simgrid::surf::NetCard *netcard = new simgrid::surf::NetCardImpl(new_as->name_, SURF_NETWORK_ELEMENT_AS, current_routing);
+ if (current_routing == NULL && routing_platf->root_ == NULL) {
/* it is the first one */
- new_as->p_routingFather = NULL;
- routing_platf->p_root = new_as;
+ new_as->father_ = NULL;
+ routing_platf->root_ = new_as;
netcard->setId(-1);
- } else if (current_routing != NULL && routing_platf->p_root != NULL) {
+ } else if (current_routing != NULL && routing_platf->root_ != NULL) {
- xbt_assert(!xbt_dict_get_or_null
- (current_routing->p_routingSons, AS->id),
+ xbt_assert(!xbt_dict_get_or_null(current_routing->sons_, AS->id),
"The AS \"%s\" already exists", AS->id);
/* it is a part of the tree */
- new_as->p_routingFather = current_routing;
+ new_as->father_ = current_routing;
/* set the father behavior */
- if (current_routing->p_hierarchy == SURF_ROUTING_NULL)
- current_routing->p_hierarchy = SURF_ROUTING_RECURSIVE;
+ if (current_routing->hierarchy_ == SURF_ROUTING_NULL)
+ current_routing->hierarchy_ = SURF_ROUTING_RECURSIVE;
/* add to the sons dictionary */
- xbt_dict_set(current_routing->p_routingSons, AS->id,
+ xbt_dict_set(current_routing->sons_, AS->id,
(void *) new_as, NULL);
/* add to the father element list */
- netcard->setId(current_routing->parseAS(netcard));
+ netcard->setId(current_routing->addComponent(netcard));
} else {
THROWF(arg_error, 0, "All defined components must belong to a AS");
}
- xbt_lib_set(as_router_lib, netcard->getName(), ROUTING_ASR_LEVEL,
+ xbt_lib_set(as_router_lib, netcard->name(), ROUTING_ASR_LEVEL,
(void *) netcard);
- XBT_DEBUG("Having set name '%s' id '%d'", new_as->p_name, netcard->getId());
+ XBT_DEBUG("Having set name '%s' id '%d'", new_as->name_, netcard->id());
/* set the new current component of the tree */
current_routing = new_as;
- current_routing->p_netcard = netcard;
+ current_routing->netcard_ = netcard;
simgrid::surf::netcardCreatedCallbacks(netcard);
simgrid::surf::asCreatedCallbacks(new_as);
{
xbt_assert(current_routing, "Cannot seal the current AS: none under construction");
current_routing->Seal();
- current_routing = current_routing->p_routingFather;
+ current_routing = current_routing->father_;
}
/* Aux Business methods */
/* (1) find the as where the src and dst are located */
sg_netcard_t src_data = src;
sg_netcard_t dst_data = dst;
- src_as = src_data->getRcComponent();
- dst_as = dst_data->getRcComponent();
+ src_as = src_data->containingAS();
+ dst_as = dst_data->containingAS();
#ifndef NDEBUG
- char* src_name = src_data->getName();
- char* dst_name = dst_data->getName();
+ char* src_name = src_data->name();
+ char* dst_name = dst_data->name();
#endif
xbt_assert(src_as && dst_as,
"Ask for route \"from\"(%s) or \"to\"(%s) no found", src_name, dst_name);
/* (2) find the path to the root routing component */
- for (current = src_as; current != NULL; current = current->p_routingFather) {
+ for (current = src_as; current != NULL; current = current->father_) {
if (index_src >= ELEMENTS_FATHER_MAXDEPTH)
xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_src");
path_src[index_src++] = current;
}
- for (current = dst_as; current != NULL; current = current->p_routingFather) {
+ for (current = dst_as; current != NULL; current = current->father_) {
if (index_dst >= ELEMENTS_FATHER_MAXDEPTH)
xbt_die("ELEMENTS_FATHER_MAXDEPTH should be increased for path_dst");
path_dst[index_dst++] = current;
#undef ELEMENTS_FATHER_MAXDEPTH
}
-/* Global Business methods */
-
/**
- * \brief Recursive function for get_route_latency
+ * \brief Recursive function for get_route_and_latency
*
* \param src the source host name
* \param dst the destination host name
* \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 ASes tree.
+ * This function is called by "get_route" and "get_latency". It allows to walk recursively through the ASes tree.
*/
static void _get_route_and_latency(
simgrid::surf::NetCard *src, simgrid::surf::NetCard *dst,
memset(&route,0,sizeof(route));
xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method");
- XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->getName(), dst->getName());
+ XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name(), dst->name());
/* Find how src and dst are interconnected */
simgrid::surf::As *common_father, *src_father, *dst_father;
elements_father(src, dst, &common_father, &src_father, &dst_father);
XBT_DEBUG("elements_father: common father '%s' src_father '%s' dst_father '%s'",
- common_father->p_name, src_father->p_name, dst_father->p_name);
-
- /* Check whether a direct bypass is defined */
- sg_platf_route_cbarg_t e_route_bypass = NULL;
- //FIXME:REMOVE:if (common_father->get_bypass_route)
+ common_father->name_, src_father->name_, dst_father->name_);
- e_route_bypass = common_father->getBypassRoute(src, dst, latency);
-
- /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */
- if (e_route_bypass) {
- xbt_dynar_merge(links, &e_route_bypass->link_list);
- routing_route_free(e_route_bypass);
+ /* Check whether a direct bypass is defined. If so, use it and bail out */
+ sg_platf_route_cbarg_t bypassed_route = common_father->getBypassRoute(src, dst, latency);
+ if (bypassed_route) {
+ xbt_dynar_merge(links, &bypassed_route->link_list);
+ routing_route_free(bypassed_route);
return;
}
if (src_father == dst_father) { /* SURF_ROUTING_BASE */
route.link_list = *links;
common_father->getRouteAndLatency(src, dst, &route, latency);
- // if vivaldi latency+=vivaldi(src,dst)
return;
}
/* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/
- route.link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
+ route.link_list = xbt_dynar_new(sizeof(Link*), NULL);
// Find the net_card corresponding to father
- simgrid::surf::NetCard *src_father_netcard = src_father->p_netcard;
- simgrid::surf::NetCard *dst_father_netcard = dst_father->p_netcard;
+ simgrid::surf::NetCard *src_father_netcard = src_father->netcard_;
+ simgrid::surf::NetCard *dst_father_netcard = dst_father->netcard_;
common_father->getRouteAndLatency(src_father_netcard, dst_father_netcard,
&route, latency);
xbt_assert((route.gw_src != NULL) && (route.gw_dst != NULL),
- "bad gateways for route from \"%s\" to \"%s\"", src->getName(), dst->getName());
+ "bad gateways for route from \"%s\" to \"%s\"", src->name(), dst->name());
sg_netcard_t src_gateway_net_elm = route.gw_src;
sg_netcard_t dst_gateway_net_elm = route.gw_dst;
}
AS_t surf_platf_get_root(routing_platf_t platf){
- return platf->p_root;
+ return platf->root_;
}
e_surf_network_element_type_t surf_routing_edge_get_rc_type(sg_netcard_t netcard){
*/
void RoutingPlatf::getRouteAndLatency(NetCard *src, NetCard *dst, xbt_dynar_t* route, double *latency)
{
- XBT_DEBUG("getRouteAndLatency from %s to %s", src->getName(), dst->getName());
+ XBT_DEBUG("getRouteAndLatency from %s to %s", src->name(), dst->name());
if (NULL == *route) {
- xbt_dynar_reset(routing_platf->p_lastRoute);
- *route = routing_platf->p_lastRoute;
+ xbt_dynar_reset(routing_platf->lastRoute_);
+ *route = routing_platf->lastRoute_;
}
_get_route_and_latency(src, dst, route, latency);
-
- xbt_assert(!latency || *latency >= 0.0,
- "negative latency on route between \"%s\" and \"%s\"", src->getName(), dst->getName());
}
-xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
- return recursiveGetOneLinkRoutes(p_root);
-}
-
-xbt_dynar_t RoutingPlatf::recursiveGetOneLinkRoutes(As *rc)
+static xbt_dynar_t _recursiveGetOneLinkRoutes(As *rc)
{
xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f);
char *key;
xbt_dict_cursor_t cursor = NULL;
AS_t rc_child;
- xbt_dict_foreach(rc->p_routingSons, cursor, key, rc_child) {
- xbt_dynar_t onelink_child = recursiveGetOneLinkRoutes(rc_child);
+ xbt_dict_foreach(rc->sons_, cursor, key, rc_child) {
+ xbt_dynar_t onelink_child = _recursiveGetOneLinkRoutes(rc_child);
if (onelink_child)
xbt_dynar_merge(&ret,&onelink_child);
}
return ret;
}
+xbt_dynar_t RoutingPlatf::getOneLinkRoutes(){
+ return _recursiveGetOneLinkRoutes(root_);
+}
+
}
}
/* ************************************************************************** */
/* ************************* GENERIC PARSE FUNCTIONS ************************ */
-void routing_cluster_add_backbone(void* bb) {
- xbt_assert(current_routing->p_modelDesc == &routing_models[SURF_MODEL_CLUSTER],
- "You have to be in model Cluster to use tag backbone!");
- xbt_assert(!static_cast<simgrid::surf::AsCluster*>(current_routing)->p_backbone, "The backbone link is already defined!");
- static_cast<simgrid::surf::AsCluster*>(current_routing)->p_backbone =
- static_cast<simgrid::surf::Link*>(bb);
- XBT_DEBUG("Add a backbone to AS '%s'", current_routing->p_name);
+void routing_cluster_add_backbone(simgrid::surf::Link* bb) {
+ simgrid::surf::AsCluster *cluster = dynamic_cast<simgrid::surf::AsCluster*>(current_routing);
+
+ xbt_assert(cluster, "Only hosts from Cluster can get a backbone.");
+ xbt_assert(nullptr == cluster->backbone_, "Cluster %s already has a backbone link!", cluster->name_);
+
+ cluster->backbone_ = bb;
+ XBT_DEBUG("Add a backbone to AS '%s'", current_routing->name_);
}
void sg_platf_new_cabinet(sg_platf_cabinet_cbarg_t cabinet)
host_link.id = host_id;
host_link.link_up = link_up;
host_link.link_down = link_down;
- sg_platf_new_netcard(&host_link);
+ sg_platf_new_hostlink(&host_link);
free(host_id);
free(link_id);
host_link.id = host_id;
host_link.link_up = link_up;
host_link.link_down = link_down;
- sg_platf_new_netcard(&host_link);
+ sg_platf_new_hostlink(&host_link);
XBT_DEBUG("<router id=\"%s\"/>", router_id);
s_sg_platf_router_cbarg_t router = SG_PLATF_ROUTER_INITIALIZER;
router.id = router_id;
router.coord = peer->coord;
sg_platf_new_router(&router);
- static_cast<AsCluster*>(current_routing)->p_router = static_cast<NetCard*>(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL));
+ static_cast<AsCluster*>(current_routing)->router_ = static_cast<NetCard*>(xbt_lib_get_or_null(as_router_lib, router.id, ROUTING_ASR_LEVEL));
XBT_DEBUG("</AS>");
sg_platf_new_AS_end();
char *key;
AS_t elem;
- xbt_dict_foreach(as->p_routingSons, cursor, key, elem) {
+ xbt_dict_foreach(as->sons_, cursor, key, elem) {
finalize_rec(elem);
}
namespace surf {
RoutingPlatf::RoutingPlatf(void *loopback)
- : p_loopback(loopback)
+ : loopback_(loopback)
{
}
RoutingPlatf::~RoutingPlatf()
{
- xbt_dynar_free(&p_lastRoute);
- finalize_rec(p_root);
+ xbt_dynar_free(&lastRoute_);
+ finalize_rec(root_);
}
}
}
AS_t surf_AS_get_routing_root() {
- return routing_platf->p_root;
+ return routing_platf->root_;
}
const char *surf_AS_get_name(simgrid::surf::As *as) {
- return as->p_name;
+ return as->name_;
}
static simgrid::surf::As *surf_AS_recursive_get_by_name(
AS_t elem;
simgrid::surf::As *tmp = NULL;
- if(!strcmp(current->p_name, name))
+ if(!strcmp(current->name_, name))
return current;
- xbt_dict_foreach(current->p_routingSons, cursor, key, elem) {
+ xbt_dict_foreach(current->sons_, cursor, key, elem) {
tmp = surf_AS_recursive_get_by_name(elem, name);
if(tmp != NULL ) {
break;
simgrid::surf::As *surf_AS_get_by_name(const char * name)
{
- simgrid::surf::As *as = surf_AS_recursive_get_by_name(routing_platf->p_root, name);
+ simgrid::surf::As *as = surf_AS_recursive_get_by_name(routing_platf->root_, name);
if(as == NULL)
XBT_WARN("Impossible to find an AS with name %s, please check your input", name);
return as;
xbt_dict_t surf_AS_get_routing_sons(simgrid::surf::As *as)
{
- return as->p_routingSons;
+ return as->sons_;
}
xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as)
{
- xbt_dynar_t elms = as->p_indexNetworkElm;
+ xbt_dynar_t elms = as->vertices_;
int count = xbt_dynar_length(elms);
xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), NULL);
for (int index = 0; index < count; index++) {
sg_netcard_t relm =
xbt_dynar_get_as(elms, index, simgrid::surf::NetCard*);
- sg_host_t delm = simgrid::s4u::Host::by_name_or_null(relm->getName());
+ sg_host_t delm = simgrid::s4u::Host::by_name_or_null(relm->name());
if (delm!=NULL) {
xbt_dynar_push(res, &delm);
}
