X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0bac7d0f735ac8ba47a46e1db4f6d7a7164fe0f2..5410c0dedd6e07e55c0a74a0664d1f8a73d69c1e:/src/surf/surf_routing.cpp diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp index 433de56176..4ad2e76499 100644 --- a/src/surf/surf_routing.cpp +++ b/src/surf/surf_routing.cpp @@ -172,7 +172,8 @@ simgrid::surf::RoutingEdge *routing_add_host( SURF_NETWORK_ELEMENT_HOST, current_routing); routingEdge->setId(current_routing->parsePU(routingEdge)); - sg_host_edge_set(sg_host_by_name_or_create(host->id), routingEdge); + sg_host_t h = sg_host_by_name_or_create(host->id); + sg_host_edge_set(h, routingEdge); XBT_DEBUG("Having set name '%s' id '%d'", host->id, routingEdge->getId()); simgrid::surf::routingEdgeCreatedCallbacks(routingEdge); @@ -196,7 +197,7 @@ simgrid::surf::RoutingEdge *routing_add_host( } xbt_dynar_shrink(ctn, 0); xbt_dynar_free(&ctn_str); - simgrid::Host::get_host(host->id)->set_facet(COORD_HOST_LEVEL, (void *) ctn); + h->set_facet(COORD_HOST_LEVEL, (void *) ctn); XBT_DEBUG("Having set host coordinates for '%s'",host->id); } @@ -1339,7 +1340,7 @@ xbt_dynar_t surf_AS_get_hosts(simgrid::surf::As *as) for (int index = 0; index < count; index++) { sg_routing_edge_t relm = xbt_dynar_get_as(elms, index, simgrid::surf::RoutingEdge*); - sg_host_t delm = simgrid::Host::find_host(relm->getName()); + sg_host_t delm = simgrid::Host::by_name_or_null(relm->getName()); if (delm!=NULL) { xbt_dynar_push(res, &delm); }