X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/da23351cb44bc018edc2c181b90bcdb7083b061c..7a955948edf1a0c37594d87693315dfc2dac9a8f:/src/kernel/routing/RoutedZone.cpp diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp index 1a2058b83b..6905ed9720 100644 --- a/src/kernel/routing/RoutedZone.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -59,7 +59,10 @@ namespace simgrid { namespace kernel { namespace routing { -RoutedZone::RoutedZone(NetZoneImpl* father, std::string name) : NetZoneImpl(father, name) {} +RoutedZone::RoutedZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel) + : NetZoneImpl(father, name, netmodel) +{ +} void RoutedZone::get_graph(xbt_graph_t graph, std::map* nodes, std::map* edges) @@ -185,9 +188,9 @@ void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* xbt_assert(dst->is_netzone(), "When defining a NetzoneRoute, dst must be a netzone but '%s' is not", dstName); xbt_assert(gw_src->is_host() || gw_src->is_router(), - "When defining a NetzoneRoute, gw_src must be an host or a router but '%s' is not.", srcName); + "When defining a NetzoneRoute, gw_src must be a host or a router but '%s' is not.", srcName); xbt_assert(gw_dst->is_host() || gw_dst->is_router(), - "When defining a NetzoneRoute, gw_dst must be an host or a router but '%s' is not.", dstName); + "When defining a NetzoneRoute, gw_dst must be a host or a router but '%s' is not.", dstName); xbt_assert(gw_src != gw_dst, "Cannot define an NetzoneRoute from '%s' to itself", gw_src->get_cname()); @@ -199,7 +202,7 @@ void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* dstName, gw_dst->get_cname()); } - piface_.on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list); + simgrid::s4u::NetZone::on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list); } } }