-/* Copyright (c) 2006-2016. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-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 "xbt/log.h"
-
-#include "simgrid/s4u/host.hpp"
-#include "src/kernel/routing/NetCard.hpp"
#include "src/kernel/routing/NetZoneImpl.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/network_interface.hpp"
+#include "xbt/log.h"
+
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_route);
namespace simgrid {
class BypassRoute {
public:
- explicit BypassRoute(NetCard* gwSrc, NetCard* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
- const NetCard* gw_src;
- const NetCard* gw_dst;
- std::vector<Link*> links;
+ explicit BypassRoute(NetPoint* gwSrc, NetPoint* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {}
+ NetPoint* gw_src;
+ NetPoint* gw_dst;
+ std::vector<surf::LinkImpl*> links;
};
NetZoneImpl::NetZoneImpl(NetZone* father, const char* name) : NetZone(father, name)
{
- xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL),
+ xbt_assert(nullptr == simgrid::s4u::Engine::instance()->netpointByNameOrNull(name),
"Refusing to create a second NetZone called '%s'.", name);
- netcard_ = new NetCard(name, NetCard::Type::NetZone, static_cast<NetZoneImpl*>(father));
- xbt_lib_set(as_router_lib, name, ROUTING_ASR_LEVEL, static_cast<void*>(netcard_));
- XBT_DEBUG("NetZone '%s' created with the id '%d'", name, netcard_->id());
+ netpoint_ = new NetPoint(name, NetPoint::Type::NetZone, static_cast<NetZoneImpl*>(father));
+ XBT_DEBUG("NetZone '%s' created with the id '%d'", name, netpoint_->id());
}
NetZoneImpl::~NetZoneImpl()
{
for (auto& kv : bypassRoutes_)
delete kv.second;
+
+ simgrid::s4u::Engine::instance()->netpointUnregister(netpoint_);
}
-simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmount)
+simgrid::s4u::Host* NetZoneImpl::createHost(const char* name, std::vector<double>* speedPerPstate, int coreAmount,
+ std::unordered_map<std::string, std::string>* props)
{
simgrid::s4u::Host* res = new simgrid::s4u::Host(name);
if (hierarchy_ == RoutingMode::unset)
hierarchy_ = RoutingMode::base;
- res->pimpl_netcard = new NetCard(name, NetCard::Type::Host, this);
+ res->pimpl_netpoint = new NetPoint(name, NetPoint::Type::Host, this);
surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
+ if (props != nullptr)
+ for (auto kv : *props)
+ res->setProperty(kv.first.c_str(), kv.second.c_str());
+
+ simgrid::s4u::Host::onCreation(*res);
+
return res;
}
{
/* Argument validity checks */
if (e_route->gw_dst) {
- XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s", e_route->src->cname(), e_route->gw_src->cname(),
+ XBT_DEBUG("Load bypassNetzoneRoute from %s@%s to %s@%s", e_route->src->cname(), e_route->gw_src->cname(),
e_route->dst->cname(), e_route->gw_dst->cname());
xbt_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.",
e_route->src->cname(), e_route->gw_src->cname(), e_route->dst->cname(), e_route->gw_dst->cname());
* src dst
* @endverbatim
*
- * In the base case (when src and dst are in the same AS), things are as follows:
+ * In the base case (when src and dst are in the same netzone), things are as follows:
* @verbatim
* platform root
* |
* dst
* @endverbatim
*/
-static void find_common_ancestors(NetCard* src, NetCard* dst,
+static void find_common_ancestors(NetPoint* src, NetPoint* dst,
/* OUT */ NetZoneImpl** common_ancestor, NetZoneImpl** src_ancestor,
NetZoneImpl** dst_ancestor)
{
NetZoneImpl* src_as = src->netzone();
NetZoneImpl* dst_as = dst->netzone();
- xbt_assert(src_as, "Host %s must be in an AS", src->cname());
- xbt_assert(dst_as, "Host %s must be in an AS", dst->cname());
+ xbt_assert(src_as, "Host %s must be in a netzone", src->cname());
+ xbt_assert(dst_as, "Host %s must be in a netzone", dst->cname());
/* (2) find the path to the root routing component */
std::vector<NetZoneImpl*> path_src;
*
* This works because all SimGrid platform have a unique root element (that is the last element of both paths).
*/
- NetZoneImpl* father = nullptr; // the AS we dropped on the previous loop iteration
+ NetZoneImpl* father = nullptr; // the netzone we dropped on the previous loop iteration
while (path_src.size() > 1 && path_dst.size() > 1 &&
path_src.at(path_src.size() - 1) == path_dst.at(path_dst.size() - 1)) {
father = path_src.at(path_src.size() - 1);
}
/* PRECONDITION: this is the common ancestor of src and dst */
-bool NetZoneImpl::getBypassRoute(routing::NetCard* src, routing::NetCard* dst,
- /* OUT */ std::vector<surf::Link*>* links, double* latency)
+bool NetZoneImpl::getBypassRoute(routing::NetPoint* src, routing::NetPoint* dst,
+ /* OUT */ std::vector<surf::LinkImpl*>* links, double* latency)
{
// If never set a bypass route return nullptr without any further computations
if (bypassRoutes_.empty())
if (dst->netzone() == this && src->netzone() == this) {
if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) {
BypassRoute* bypassedRoute = bypassRoutes_.at({src, dst});
- for (surf::Link* link : bypassedRoute->links) {
+ for (surf::LinkImpl* link : bypassedRoute->links) {
links->push_back(link);
if (latency)
*latency += link->latency();
/* (3) Search for a bypass making the path up to the ancestor useless */
BypassRoute* bypassedRoute = nullptr;
- std::pair<kernel::routing::NetCard*, kernel::routing::NetCard*> key;
+ std::pair<kernel::routing::NetPoint*, kernel::routing::NetPoint*> key;
for (int max = 0; max <= max_index; max++) {
for (int i = 0; i < max; i++) {
if (i <= max_index_src && max <= max_index_dst) {
- key = {path_src.at(i)->netcard_, path_dst.at(max)->netcard_};
+ key = {path_src.at(i)->netpoint_, path_dst.at(max)->netpoint_};
if (bypassRoutes_.find(key) != bypassRoutes_.end()) {
bypassedRoute = bypassRoutes_.at(key);
break;
}
}
if (max <= max_index_src && i <= max_index_dst) {
- key = {path_src.at(max)->netcard_, path_dst.at(i)->netcard_};
+ key = {path_src.at(max)->netpoint_, path_dst.at(i)->netpoint_};
if (bypassRoutes_.find(key) != bypassRoutes_.end()) {
bypassedRoute = bypassRoutes_.at(key);
break;
break;
if (max <= max_index_src && max <= max_index_dst) {
- key = {path_src.at(max)->netcard_, path_dst.at(max)->netcard_};
+ key = {path_src.at(max)->netpoint_, path_dst.at(max)->netpoint_};
if (bypassRoutes_.find(key) != bypassRoutes_.end()) {
bypassedRoute = bypassRoutes_.at(key);
break;
"calls to getRoute",
src->cname(), dst->cname(), bypassedRoute->links.size());
if (src != key.first)
- getGlobalRoute(src, const_cast<NetCard*>(bypassedRoute->gw_src), links, latency);
- for (surf::Link* link : bypassedRoute->links) {
+ getGlobalRoute(src, bypassedRoute->gw_src, links, latency);
+ for (surf::LinkImpl* link : bypassedRoute->links) {
links->push_back(link);
if (latency)
*latency += link->latency();
}
if (dst != key.second)
- getGlobalRoute(const_cast<NetCard*>(bypassedRoute->gw_dst), dst, links, latency);
+ getGlobalRoute(bypassedRoute->gw_dst, dst, links, latency);
return true;
}
XBT_DEBUG("No bypass route from '%s' to '%s'.", src->cname(), dst->cname());
return false;
}
-void NetZoneImpl::getGlobalRoute(routing::NetCard* src, routing::NetCard* dst,
- /* OUT */ std::vector<surf::Link*>* links, double* latency)
+void NetZoneImpl::getGlobalRoute(routing::NetPoint* src, routing::NetPoint* dst,
+ /* OUT */ std::vector<surf::LinkImpl*>* links, double* latency)
{
s_sg_platf_route_cbarg_t route;
memset(&route, 0, sizeof(route));
XBT_DEBUG("Resolve route from '%s' to '%s'", src->cname(), dst->cname());
/* Find how src and dst are interconnected */
- NetZoneImpl *common_ancestor, *src_ancestor, *dst_ancestor;
+ NetZoneImpl *common_ancestor;
+ NetZoneImpl *src_ancestor;
+ NetZoneImpl *dst_ancestor;
find_common_ancestors(src, dst, &common_ancestor, &src_ancestor, &dst_ancestor);
XBT_DEBUG("elements_father: common ancestor '%s' src ancestor '%s' dst ancestor '%s'", common_ancestor->name(),
src_ancestor->name(), dst_ancestor->name());
if (common_ancestor->getBypassRoute(src, dst, links, latency))
return;
- /* If src and dst are in the same AS, life is good */
+ /* If src and dst are in the same netzone, life is good */
if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */
route.link_list = links;
common_ancestor->getLocalRoute(src, dst, &route, latency);
return;
}
- /* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/
+ /* Not in the same netzone, no bypass. We'll have to find our path between the netzones recursively */
- route.link_list = new std::vector<surf::Link*>();
+ route.link_list = new std::vector<surf::LinkImpl*>();
- common_ancestor->getLocalRoute(src_ancestor->netcard_, dst_ancestor->netcard_, &route, latency);
+ common_ancestor->getLocalRoute(src_ancestor->netpoint_, dst_ancestor->netpoint_, &route, latency);
xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "bad gateways for route from \"%s\" to \"%s\"",
src->cname(), dst->cname());
