A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright lines for 2023.
[simgrid.git]
/
include
/
simgrid
/
kernel
/
routing
/
NetPoint.hpp
diff --git
a/include/simgrid/kernel/routing/NetPoint.hpp
b/include/simgrid/kernel/routing/NetPoint.hpp
index
fd26947
..
566eee3
100644
(file)
--- a/
include/simgrid/kernel/routing/NetPoint.hpp
+++ b/
include/simgrid/kernel/routing/NetPoint.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-20
18
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-20
23
. 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. */
/* 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 {
#include <simgrid/kernel/routing/NetZoneImpl.hpp>
namespace simgrid {
+
+extern template class XBT_PUBLIC xbt::Extendable<kernel::routing::NetPoint>;
+
namespace kernel {
namespace routing {
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
*/
*
* @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 };
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.
// Our rank in the vertices_ array of the netzone that contains us.
- unsigned
int id()
{ return id_; }
- const std::string& get
N
ame() const { return name_; }
- const char* get
C
name() const { return name_.c_str(); }
+ unsigned
long id() const
{ return id_; }
+ const std::string& get
_n
ame() const { return name_; }
+ const char* get
_c
name() const { return name_.c_str(); }
/** @brief the NetZone in which this NetPoint is included */
/** @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 is
NetZone()
{ return component_type_ == Type::NetZone; }
- bool is
Host()
{ return component_type_ == Type::Host; }
- bool is
Router()
{ 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*)> onC
reation;
+ static
xbt::signal<void(NetPoint&)> on_c
reation;
bool operator<(const NetPoint& rhs) const { return name_ < rhs.name_; }
private:
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_;
std::string name_;
NetPoint::Type component_type_;
- NetZoneImpl*
netzone_
;
+ NetZoneImpl*
englobing_zone_ = nullptr
;
};
} // namespace routing
} // namespace kernel
} // namespace simgrid
};
} // namespace routing
} // namespace kernel
} // namespace simgrid
-XBT_PUBLIC s
g_netpoint_t
sg_netpoint_by_name_or_null(const char* name);
+XBT_PUBLIC s
imgrid::kernel::routing::NetPoint*
sg_netpoint_by_name_or_null(const char* name);
#endif /* KERNEL_ROUTING_NETPOINT_HPP_ */
#endif /* KERNEL_ROUTING_NETPOINT_HPP_ */