X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7af42b150d36397fb6016657e10746b7515c658d..95a02a8febe84fd1c2ed98c78c594a5e8a0116f7:/src/kernel/routing/ClusterZone.cpp diff --git a/src/kernel/routing/ClusterZone.cpp b/src/kernel/routing/ClusterZone.cpp index ad30187323..58d8a7238b 100644 --- a/src/kernel/routing/ClusterZone.cpp +++ b/src/kernel/routing/ClusterZone.cpp @@ -1,11 +1,11 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2018. 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. */ -#include "src/kernel/routing/ClusterZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" -#include "src/kernel/routing/RoutedZone.hpp" +#include "simgrid/kernel/routing/ClusterZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/RoutedZone.hpp" #include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_cluster, surf, "Routing part of surf"); @@ -20,7 +20,7 @@ ClusterZone::ClusterZone(NetZone* father, std::string name) : NetZoneImpl(father { } -void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) +void ClusterZone::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) { XBT_VERB("cluster getLocalRoute from '%s'[%u] to '%s'[%u]", src->getCname(), src->id(), dst->getCname(), dst->id()); xbt_assert(not privateLinks_.empty(), @@ -130,7 +130,7 @@ void ClusterZone::create_links_for_node(ClusterCreationArgs* cluster, int id, in surf::LinkImpl *linkUp; surf::LinkImpl *linkDown; - if (link.policy == SURF_LINK_FULLDUPLEX) { + if (link.policy == SURF_LINK_SPLITDUPLEX) { linkUp = surf::LinkImpl::byName(link_id + "_UP"); linkDown = surf::LinkImpl::byName(link_id + "_DOWN"); } else {