X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/44ea423d2d27e986f35e6b8d60772b7acec89916..95a02a8febe84fd1c2ed98c78c594a5e8a0116f7:/src/kernel/routing/DragonflyZone.cpp diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index cc72704a3f..438320c114 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -1,10 +1,10 @@ -/* Copyright (c) 2014-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2014-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/DragonflyZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/DragonflyZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" #include @@ -112,7 +112,7 @@ void DragonflyZone::parse_specific_arguments(ClusterCreationArgs* cluster) throw std::invalid_argument(std::string("Last parameter is not the amount of nodes per blade:") + parameters[3]); } - if (cluster->sharing_policy == SURF_LINK_FULLDUPLEX) + if (cluster->sharing_policy == SURF_LINK_SPLITDUPLEX) this->numLinksperLink_ = 2; this->cluster_ = cluster; @@ -168,7 +168,7 @@ void DragonflyZone::createLink(const std::string& id, int numlinks, surf::LinkIm sg_platf_new_link(&linkTemplate); XBT_DEBUG("Generating link %s", id.c_str()); surf::LinkImpl* link; - if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) { + if (this->cluster_->sharing_policy == SURF_LINK_SPLITDUPLEX) { *linkup = surf::LinkImpl::byName(linkTemplate.id + "_UP"); // check link? *linkdown = surf::LinkImpl::byName(linkTemplate.id + "_DOWN"); // check link ? } else { @@ -199,7 +199,7 @@ void DragonflyZone::generateLinks() this->createLink(id, 1, &linkup, &linkdown); this->routers_[i]->myNodes_[j] = linkup; - if (this->cluster_->sharing_policy == SURF_LINK_FULLDUPLEX) + if (this->cluster_->sharing_policy == SURF_LINK_SPLITDUPLEX) this->routers_[i]->myNodes_[j + 1] = linkdown; uniqueId++;