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
don't free the properties of the cluster before the last host
[simgrid.git]
/
src
/
s4u
/
s4u_netzone.cpp
diff --git
a/src/s4u/s4u_netzone.cpp
b/src/s4u/s4u_netzone.cpp
index
780baad
..
6aa572d
100644
(file)
--- a/
src/s4u/s4u_netzone.cpp
+++ b/
src/s4u/s4u_netzone.cpp
@@
-23,25
+23,22
@@
simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kern
NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
{
NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
{
+ children_ = new std::vector<NetZone*>();
}
void NetZone::seal()
{
sealed_ = true;
}
}
void NetZone::seal()
{
sealed_ = true;
}
+
NetZone::~NetZone()
{
NetZone::~NetZone()
{
- xbt_dict_cursor_t cursor = nullptr;
- char* key;
- NetZone* elem;
- xbt_dict_foreach (children_, cursor, key, elem) {
- delete static_cast<NetZone*>(elem);
- }
-
- delete hosts_;
- xbt_dict_free(&children_);
+ for (auto nz : *children_)
+ delete nz;
+ delete children_;
xbt_free(name_);
}
xbt_free(name_);
}
+
std::unordered_map<std::string, std::string>* NetZone::properties()
{
return simgrid::simix::kernelImmediate([this] {
std::unordered_map<std::string, std::string>* NetZone::properties()
{
return simgrid::simix::kernelImmediate([this] {
@@
-61,7
+58,7
@@
void NetZone::setProperty(const char* key, const char* value)
});
}
});
}
-
xbt_dict_t
NetZone::children()
+
std::vector<NetZone*>*
NetZone::children()
{
return children_;
}
{
return children_;
}
@@
-76,12
+73,13
@@
NetZone* NetZone::father()
std::vector<s4u::Host*>* NetZone::hosts()
{
std::vector<s4u::Host*>* NetZone::hosts()
{
- for (auto card : vertices_) {
- s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
- if (host != nullptr)
- hosts_->push_back(host);
- }
- return hosts_;
+ if (hosts_.empty()) // Lazy initialization
+ for (auto card : vertices_) {
+ s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
+ if (host != nullptr)
+ hosts_.push_back(host);
+ }
+ return &hosts_;
}
int NetZone::addComponent(kernel::routing::NetPoint* elm)
}
int NetZone::addComponent(kernel::routing::NetPoint* elm)