X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ff6d4d968f880f2c5d9854e7786034fd27f8b868..9da45f53bdedff9ac9320a7a3c2ac1d5b9184ce2:/src/s4u/s4u_Engine.cpp
diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp
index 209600c706..ac01c07206 100644
--- a/src/s4u/s4u_Engine.cpp
+++ b/src/s4u/s4u_Engine.cpp
@@ -141,6 +141,27 @@ simgrid::s4u::Host* Engine::host_by_name_or_null(std::string name)
return host == pimpl->hosts_.end() ? nullptr : host->second;
}
+simgrid::s4u::Link* Engine::link_by_name(std::string name)
+{
+ return pimpl->links_.at(name); // Will raise a std::out_of_range if the host does not exist
+}
+
+simgrid::s4u::Link* Engine::link_by_name_or_null(std::string name)
+{
+ auto link = pimpl->links_.find(name);
+ return link == pimpl->links_.end() ? nullptr : link->second;
+}
+
+void Engine::link_register(std::string name, simgrid::s4u::Link* link)
+{
+ pimpl->links_[name] = link;
+}
+
+void Engine::link_unregister(std::string name)
+{
+ pimpl->links_.erase(name);
+}
+
/** @brief Returns the amount of storages in the platform */
size_t Engine::get_storage_count()
{
@@ -180,28 +201,24 @@ void Engine::storage_unregister(std::string name)
/** @brief Returns the amount of links in the platform */
size_t Engine::get_link_count()
{
- return kernel::resource::LinkImpl::linksCount();
+ return pimpl->links_.size();
}
/** @brief Returns the list of all links found in the platform */
std::vector Engine::get_all_links()
{
std::vector res;
- kernel::resource::LinkImpl::linksList(&res);
+ for (auto const& kv : pimpl->links_)
+ res.push_back(kv.second);
return res;
}
std::vector Engine::get_filtered_links(std::function filter)
{
- // FIXME: This is a terrible implementation and should be done
- // without getting all links first.
- std::vector res;
- kernel::resource::LinkImpl::linksList(&res);
std::vector filtered_list;
- for (auto& link : res) {
- if (filter(link))
- filtered_list.push_back(link);
- }
+ for (auto const& kv : pimpl->links_)
+ if (filter(kv.second))
+ filtered_list.push_back(kv.second);
return filtered_list;
}
@@ -256,7 +273,7 @@ static s4u::NetZone* netzone_by_name_recursive(s4u::NetZone* current, const char
if (not strcmp(current->get_cname(), name))
return current;
- for (auto const& elem : *(current->getChildren())) {
+ for (auto const& elem : *(current->get_children())) {
simgrid::s4u::NetZone* tmp = netzone_by_name_recursive(elem, name);
if (tmp != nullptr) {
return tmp;