-/* Copyright (c) 2009-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2009-2020. 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 "simgrid/kernel/routing/NetPoint.hpp"
#include "simgrid/s4u/Engine.hpp"
#include "simgrid/s4u/Host.hpp"
+#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
namespace simgrid {
+
+template class xbt::Extendable<kernel::routing::NetPoint>;
+
namespace kernel {
namespace routing {
-simgrid::xbt::signal<void(NetPoint*)> NetPoint::onCreation;
+simgrid::xbt::signal<void(NetPoint&)> NetPoint::on_creation;
-NetPoint::NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl* netzone_p)
- : name_(name), component_type_(componentType), netzone_(netzone_p)
+NetPoint::NetPoint(const std::string& name, NetPoint::Type componentType, NetZoneImpl* netzone_p)
+ : name_(name), component_type_(componentType), englobing_zone_(netzone_p)
{
if (netzone_p != nullptr)
- id_ = netzone_p->addComponent(this);
+ id_ = netzone_p->add_component(this);
else
id_ = static_cast<decltype(id_)>(-1);
- simgrid::s4u::Engine::getInstance()->netpointRegister(this);
- simgrid::kernel::routing::NetPoint::onCreation(this);
+ simgrid::s4u::Engine::get_instance()->netpoint_register(this);
+ simgrid::kernel::routing::NetPoint::on_creation(*this);
}
}
}
*/
simgrid::kernel::routing::NetPoint* sg_netpoint_by_name_or_null(const char* name)
{
- return simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
+ return simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name);
}