simgrid::xbt::signal<void(NetZone&)> NetZone::onCreation;
simgrid::xbt::signal<void(NetZone&)> NetZone::onSeal;
-NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
+NetZone::NetZone(NetZone* father, std::string name) : father_(father), name_(name)
{
children_ = new std::vector<NetZone*>();
}
NetZone::~NetZone()
{
- for (auto nz : *children_)
+ for (auto const& nz : *children_)
delete nz;
delete children_;
- xbt_free(name_);
}
-std::unordered_map<std::string, std::string>* NetZone::properties()
+std::unordered_map<std::string, std::string>* NetZone::getProperties()
{
return simgrid::simix::kernelImmediate([this] {
return &properties_;
}
/** Retrieve the property value (or nullptr if not set) */
-const char* NetZone::property(const char* key)
+const char* NetZone::getProperty(const char* key)
{
return properties_.at(key).c_str();
}
});
}
-std::vector<NetZone*>* NetZone::children()
+std::vector<NetZone*>* NetZone::getChildren()
{
return children_;
}
-char* NetZone::name()
+const char* NetZone::getCname()
{
- return name_;
+ return name_.c_str();
}
-NetZone* NetZone::father()
+NetZone* NetZone::getFather()
{
return father_;
}
-void NetZone::hosts(std::vector<s4u::Host*>* whereto)
+void NetZone::getHosts(std::vector<s4u::Host*>* whereto)
{
- for (auto card : vertices_) {
+ for (auto const& card : vertices_) {
s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
if (host != nullptr)
whereto->push_back(host);
void NetZone::addRoute(sg_platf_route_cbarg_t /*route*/)
{
- xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_);
+ xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_.c_str());
}
}
}; // namespace simgrid::s4u