-/* Copyright (c) 2013-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-2017. 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 <boost/algorithm/string.hpp>
-#include "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/host.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
#include "src/kernel/routing/NetPoint.hpp"
#include "src/kernel/routing/VivaldiZone.hpp"
Coords::Coords(NetPoint* netpoint, const char* coordStr)
{
- if (!Coords::EXTENSION_ID.valid())
+ if (not Coords::EXTENSION_ID.valid())
Coords::EXTENSION_ID = NetPoint::extension_create<Coords>();
std::vector<std::string> string_values;
std::string link_up = "link_" + netpoint->name() + "_UP";
std::string link_down = "link_" + netpoint->name() + "_DOWN";
- Link* linkUp = surf_network_model->createLink(link_up.c_str(), bw_out, 0, SURF_LINK_SHARED);
- Link* linkDown = surf_network_model->createLink(link_down.c_str(), bw_in, 0, SURF_LINK_SHARED);
+ surf::LinkImpl* linkUp = surf_network_model->createLink(link_up.c_str(), bw_out, 0, SURF_LINK_SHARED);
+ surf::LinkImpl* linkDown = surf_network_model->createLink(link_down.c_str(), bw_in, 0, SURF_LINK_SHARED);
privateLinks_.insert({netpoint->id(), {linkUp, linkDown}});
}
if (src->isNetZone()) {
std::string srcName = "router_" + src->name();
std::string dstName = "router_" + dst->name();
- route->gw_src = simgrid::s4u::Engine::instance()->netpointByNameOrNull(srcName.c_str());
- route->gw_dst = simgrid::s4u::Engine::instance()->netpointByNameOrNull(dstName.c_str());
+ route->gw_src = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(srcName.c_str());
+ route->gw_dst = simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(dstName.c_str());
}
/* Retrieve the private links */
if (privateLinks_.find(src->id()) != privateLinks_.end()) {
- std::pair<Link*, Link*> info = privateLinks_.at(src->id());
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(src->id());
if (info.first) {
route->link_list->push_back(info.first);
if (lat)
}
}
if (privateLinks_.find(dst->id()) != privateLinks_.end()) {
- std::pair<Link*, Link*> info = privateLinks_.at(dst->id());
+ std::pair<surf::LinkImpl*, surf::LinkImpl*> info = privateLinks_.at(dst->id());
if (info.second) {
route->link_list->push_back(info.second);
if (lat)