X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f9587e71330e7471ef675d2652cee260a0e3a96..040d8fa855d2b6ac9884f68108a09b935570be21:/src/kernel/routing/NetPoint.cpp

diff --git a/src/kernel/routing/NetPoint.cpp b/src/kernel/routing/NetPoint.cpp
index 5bf404bfe0..003a87ff66 100644
--- a/src/kernel/routing/NetPoint.cpp
+++ b/src/kernel/routing/NetPoint.cpp
@@ -1,40 +1,54 @@
-/* Copyright (c) 2009-2011, 2013-2016. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2009-2022. 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/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/VivaldiZone.hpp"
+#include "simgrid/s4u/Engine.hpp"
+#include "simgrid/s4u/Host.hpp"
+#include "xbt/log.h"
 
-#include "simgrid/s4u/engine.hpp"
-#include "simgrid/s4u/host.hpp"
-#include "surf/surf_routing.h"
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_netpoint, ker_routing, "Kernel implementation of netpoints");
 
 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), componentType_(componentType), netzone_(netzone_p)
+NetPoint::NetPoint(const std::string& name, NetPoint::Type componentType) : name_(name), component_type_(componentType)
 {
-  if (netzone_p != nullptr)
-    id_ = netzone_p->addComponent(this);
-  simgrid::s4u::Engine::instance()->netcardRegister(this);
-  simgrid::kernel::routing::NetPoint::onCreation(this);
+  simgrid::s4u::Engine::get_instance()->netpoint_register(this);
+  simgrid::kernel::routing::NetPoint::on_creation(*this);
 }
+
+NetPoint* NetPoint::set_englobing_zone(NetZoneImpl* netzone_p)
+{
+  englobing_zone_ = netzone_p;
+  if (netzone_p != nullptr)
+    id_ = netzone_p->add_component(this);
+  return this;
 }
+
+NetPoint* NetPoint::set_coordinates(const std::string& coords)
+{
+  if (not coords.empty())
+    new vivaldi::Coords(this, coords);
+  return this;
 }
-} // namespace simgrid::kernel::routing
+} // namespace routing
+} // namespace kernel
+} // namespace simgrid
 
-/** @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::get_instance()->netpoint_by_name_or_null(name);
 }