NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
{
+ children_ = new std::vector<NetZone*>();
}
+
void NetZone::seal()
{
sealed_ = true;
}
+
NetZone::~NetZone()
{
- xbt_dict_cursor_t cursor = nullptr;
- char* key;
- NetZone_t elem;
- xbt_dict_foreach (children_, cursor, key, elem) {
- delete static_cast<NetZone*>(elem);
- }
-
- xbt_dict_free(&children_);
+ for (auto nz : *children_)
+ delete nz;
+ delete children_;
xbt_free(name_);
}
+
std::unordered_map<std::string, std::string>* NetZone::properties()
{
- return simgrid::simix::kernelImmediate([=] {
+ return simgrid::simix::kernelImmediate([this] {
return &properties_;
});
}
}
void NetZone::setProperty(const char* key, const char* value)
{
- simgrid::simix::kernelImmediate([=,&key,&value] {
+ simgrid::simix::kernelImmediate([this,key,value] {
properties_[key] = value;
});
}
-xbt_dict_t NetZone::children()
+std::vector<NetZone*>* NetZone::children()
{
return children_;
}
return father_;
}
-xbt_dynar_t NetZone::hosts()
+std::vector<s4u::Host*>* NetZone::hosts()
{
- xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
-
- for (auto card : vertices_) {
- s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
- if (host != nullptr)
- xbt_dynar_push(res, &host);
- }
- return res;
+ 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)