X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bf41d7b09bccdac18be3631c03256f2a34bdb202..ea74f5d95928a521a588737e81f1de94eef25d19:/include/simgrid/kernel/routing/NetPoint.hpp

diff --git a/include/simgrid/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp
index fd2694753e..72f1c8dd35 100644
--- a/include/simgrid/kernel/routing/NetPoint.hpp
+++ b/include/simgrid/kernel/routing/NetPoint.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-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. */
@@ -13,6 +13,9 @@
 #include <simgrid/kernel/routing/NetZoneImpl.hpp>
 
 namespace simgrid {
+
+extern template class XBT_PUBLIC xbt::Extendable<kernel::routing::NetPoint>;
+
 namespace kernel {
 namespace routing {
 
@@ -21,39 +24,40 @@ namespace routing {
  *
  * @details This represents a position in the network. One can send information between two netpoints
  */
-class NetPoint : public simgrid::xbt::Extendable<NetPoint> {
-
+class NetPoint : public xbt::Extendable<NetPoint> {
 public:
   enum class Type { Host, Router, NetZone };
 
-  NetPoint(std::string name, NetPoint::Type componentType, NetZoneImpl* netzone_p);
-  ~NetPoint() = default;
+  NetPoint(const std::string& name, NetPoint::Type component_type);
 
   // Our rank in the vertices_ array of the netzone that contains us.
-  unsigned int id() { return id_; }
-  const std::string& getName() const { return name_; }
-  const char* getCname() const { return name_.c_str(); }
+  unsigned long id() const { return id_; }
+  const std::string& get_name() const { return name_; }
+  const char* get_cname() const { return name_.c_str(); }
   /** @brief the NetZone in which this NetPoint is included */
-  NetZoneImpl* netzone() { return netzone_; }
+  NetZoneImpl* get_englobing_zone() const { return englobing_zone_; }
+  /** @brief Set the NetZone in which this NetPoint is included */
+  NetPoint* set_englobing_zone(NetZoneImpl* netzone_p);
+  NetPoint* set_coordinates(const std::string& coords);
 
-  bool isNetZone() { return component_type_ == Type::NetZone; }
-  bool isHost() { return component_type_ == Type::Host; }
-  bool isRouter() { return component_type_ == Type::Router; }
+  bool is_netzone() const { return component_type_ == Type::NetZone; }
+  bool is_host() const { return component_type_ == Type::Host; }
+  bool is_router() const { return component_type_ == Type::Router; }
 
-  static simgrid::xbt::signal<void(NetPoint*)> onCreation;
+  static xbt::signal<void(NetPoint&)> on_creation;
 
   bool operator<(const NetPoint& rhs) const { return name_ < rhs.name_; }
 
 private:
-  unsigned int id_;
+  unsigned long id_ = -1;
   std::string name_;
   NetPoint::Type component_type_;
-  NetZoneImpl* netzone_;
+  NetZoneImpl* englobing_zone_ = nullptr;
 };
 } // namespace routing
 } // namespace kernel
 } // namespace simgrid
 
-XBT_PUBLIC sg_netpoint_t sg_netpoint_by_name_or_null(const char* name);
+XBT_PUBLIC simgrid::kernel::routing::NetPoint* sg_netpoint_by_name_or_null(const char* name);
 
 #endif /* KERNEL_ROUTING_NETPOINT_HPP_ */