}
NetZoneContainer::NetZoneContainer(std::string name, unsigned int level, NetZoneContainer* father)
- : Container::Container(name, "", father)
+ : Container::Container(std::move(name), "", father)
{
- netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name);
- xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
+ netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name());
+ xbt_assert(netpoint_, "Element '%s' not found", get_cname());
if (father_) {
std::string type_name = std::string("L") + std::to_string(level);
type_ = father_->type_->by_name_or_create<ContainerType>(type_name);
}
}
-RouterContainer::RouterContainer(std::string name, Container* father) : Container::Container(name, "ROUTER", father)
+RouterContainer::RouterContainer(std::string name, Container* father)
+ : Container::Container(std::move(name), "ROUTER", father)
{
xbt_assert(father, "Only the Root container has no father");
- netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(name);
- xbt_assert(netpoint_, "Element '%s' not found", name.c_str());
+ netpoint_ = simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(get_name());
+ xbt_assert(netpoint_, "Element '%s' not found", get_cname());
trivaNodeTypes.insert(type_->get_name());
}
trivaNodeTypes.insert(type_->get_name());
}
-Container::Container(std::string name, std::string type_name, Container* father) : name_(name), father_(father)
+Container::Container(std::string name, const std::string& type_name, Container* father)
+ : name_(std::move(name)), father_(father)
{
static long long int container_id = 0;
id_ = container_id; // id (or alias) of the container
allContainers.erase(name_);
}
-void Container::create_child(std::string name, std::string type_name)
+void Container::create_child(std::string name, const std::string& type_name)
{
- new Container(name, type_name, this);
+ new Container(std::move(name), type_name, this);
}
-Container* Container::by_name_or_null(std::string name)
+Container* Container::by_name_or_null(const std::string& name)
{
auto cont = allContainers.find(name);
return cont == allContainers.end() ? nullptr : cont->second;
}
-Container* Container::by_name(std::string name)
+Container* Container::by_name(const std::string& name)
{
Container* ret = Container::by_name_or_null(name);
xbt_assert(ret != nullptr, "container with name %s not found", name.c_str());
}
}
-StateType* Container::get_state(std::string name)
+StateType* Container::get_state(const std::string& name)
{
StateType* ret = dynamic_cast<StateType*>(type_->by_name(name));
ret->set_calling_container(this);
return ret;
}
-LinkType* Container::get_link(std::string name)
+LinkType* Container::get_link(const std::string& name)
{
LinkType* ret = dynamic_cast<LinkType*>(type_->by_name(name));
ret->set_calling_container(this);
return ret;
}
-VariableType* Container::get_variable(std::string name)
+VariableType* Container::get_variable(const std::string& name)
{
VariableType* ret = dynamic_cast<VariableType*>(type_->by_name(name));
ret->set_calling_container(this);