-/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
namespace simgrid {
namespace s4u {
-simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
- kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
- std::vector<kernel::resource::LinkImpl*>& link_list)>
+xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
+ kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
+ std::vector<kernel::resource::LinkImpl*> const& link_list)>
NetZone::on_route_creation;
-simgrid::xbt::signal<void(NetZone&)> NetZone::on_creation;
-simgrid::xbt::signal<void(NetZone&)> NetZone::on_seal;
+xbt::signal<void(NetZone const&)> NetZone::on_creation;
+xbt::signal<void(NetZone const&)> NetZone::on_seal;
-NetZone::NetZone(kernel::routing::NetZoneImpl* impl) : pimpl_(impl) {}
-
-NetZone::~NetZone()
-{
-}
-
-std::unordered_map<std::string, std::string>* NetZone::get_properties()
+const std::unordered_map<std::string, std::string>* NetZone::get_properties() const
{
- return simgrid::simix::simcall([this] { return &properties_; });
+ return &properties_;
}
/** Retrieve the property value (or nullptr if not set) */
-const char* NetZone::get_property(const char* key)
+const char* NetZone::get_property(const std::string& key) const
{
- return properties_.at(key).c_str();
+ auto prop = properties_.find(key);
+ return prop == properties_.end() ? nullptr : prop->second.c_str();
}
-void NetZone::set_property(const char* key, const char* value)
+
+void NetZone::set_property(const std::string& key, const std::string& value)
{
- simgrid::simix::simcall([this, key, value] { properties_[key] = value; });
+ kernel::actor::simcall([this, &key, &value] { properties_[key] = value; });
}
/** @brief Returns the list of direct children (no grand-children) */
return pimpl_->get_all_hosts();
}
-void NetZone::getHosts(std::vector<s4u::Host*>* whereto)
-{
- for (auto const& card : pimpl_->get_vertices()) {
- s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->get_name());
- if (host != nullptr)
- whereto->push_back(host);
- }
-}
-
int NetZone::get_host_count()
{
return pimpl_->get_host_count();
{
pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
}
-std::vector<kernel::routing::NetPoint*> NetZone::getVertices()
-{
- return pimpl_->get_vertices();
-}
} // namespace s4u
} // namespace simgrid