X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8114a7ffbd1bce51063c0c2b19ad790c44603c66..acd052f4e734a5580577a6462a6e08c0ea3b5509:/src/surf/sg_platf.cpp diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp index da32afa883..5a3578581a 100644 --- a/src/surf/sg_platf.cpp +++ b/src/surf/sg_platf.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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. */ @@ -116,7 +116,7 @@ void sg_platf_new_link(LinkCreationArgs* link) { std::vector names; - if (link->policy == SURF_LINK_FULLDUPLEX) { + if (link->policy == SURF_LINK_SPLITDUPLEX) { names.push_back(link->id+ "_UP"); names.push_back(link->id+ "_DOWN"); } else { @@ -227,7 +227,7 @@ void sg_platf_new_cluster(ClusterCreationArgs* cluster) linkUp = simgrid::surf::LinkImpl::byName(tmp_link); linkDown = simgrid::surf::LinkImpl::byName(tmp_link); - auto as_cluster = static_cast(current_as); + auto* as_cluster = static_cast(current_as); as_cluster->privateLinks_.insert({as_cluster->nodePosition(rankId), {linkUp, linkDown}}); } @@ -315,7 +315,7 @@ void sg_platf_new_cabinet(CabinetCreationArgs* cabinet) sg_platf_new_host(&host); LinkCreationArgs link; - link.policy = SURF_LINK_FULLDUPLEX; + link.policy = SURF_LINK_SPLITDUPLEX; link.latency = cabinet->lat; link.bandwidth = cabinet->bw; link.id = "link_" + hostname; @@ -654,7 +654,7 @@ void sg_platf_new_hostlink(HostLinkCreationArgs* hostlink) xbt_assert(linkUp, "Link '%s' not found!", hostlink->link_up.c_str()); xbt_assert(linkDown, "Link '%s' not found!", hostlink->link_down.c_str()); - auto as_cluster = static_cast(current_routing); + auto* as_cluster = static_cast(current_routing); if (as_cluster->privateLinks_.find(netpoint->id()) != as_cluster->privateLinks_.end()) surf_parse_error(std::string("Host_link for '") + hostlink->id.c_str() + "' is already defined!");