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 2022.
[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
7a49f91
..
72f1c8d
100644
(file)
--- a/
include/simgrid/kernel/routing/NetPoint.hpp
+++ b/
include/simgrid/kernel/routing/NetPoint.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2013-20
22
. 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,34
+24,35
@@
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 component_type, 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_; }
+ 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 */
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* get_englobing_zone() { return englobing_zone_; }
+ 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*
)> on_creation;
+ static
xbt::signal<void(NetPoint&
)> on_creation;
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* englobing_zone_;
+ NetZoneImpl* englobing_zone_
= nullptr
;
};
} // namespace routing
} // namespace kernel
};
} // namespace routing
} // namespace kernel