-/* Copyright (c) 2009-2011, 2013-2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2009-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 "src/kernel/routing/NetPoint.hpp"
-#include "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "surf/surf_routing.h"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
{
if (netzone_p != nullptr)
id_ = netzone_p->addComponent(this);
- simgrid::s4u::Engine::instance()->netcardRegister(this);
+ simgrid::s4u::Engine::getInstance()->netpointRegister(this);
simgrid::kernel::routing::NetPoint::onCreation(this);
}
}
}
} // namespace simgrid::kernel::routing
-/** @brief Retrieve a netcard from its name
+/** @brief Retrieve a netpoint from its name
*
- * Netcards are the thing that connect host or routers to the network
+ * Netpoints denote the location of host or routers in the network, to compute routes
*/
-simgrid::kernel::routing::NetPoint* sg_netcard_by_name_or_null(const char* name)
+simgrid::kernel::routing::NetPoint* sg_netpoint_by_name_or_null(const char* name)
{
- return simgrid::s4u::Engine::instance()->netcardByNameOrNull(name);
+ return simgrid::s4u::Engine::getInstance()->getNetpointByNameOrNull(name);
}