A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
move some global signals to the Engine
[simgrid.git]
/
src
/
s4u
/
s4u_Netzone.cpp
diff --git
a/src/s4u/s4u_Netzone.cpp
b/src/s4u/s4u_Netzone.cpp
index
cb45e8e
..
dec17ec
100644
(file)
--- a/
src/s4u/s4u_Netzone.cpp
+++ b/
src/s4u/s4u_Netzone.cpp
@@
-21,25
+21,21
@@
xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routi
xbt::signal<void(NetZone const&)> NetZone::on_creation;
xbt::signal<void(NetZone const&)> 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
simix::simcall([this] { return &properties_; })
;
+ return
&properties_
;
}
/** Retrieve the property value (or nullptr if not set) */
}
/** Retrieve the property value (or nullptr if not set) */
-const char* NetZone::get_property(const std::string& 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 std::string& key, const std::string& value)
{
void NetZone::set_property(const std::string& key, const std::string& value)
{
-
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) */
}
/** @brief Returns the list of direct children (no grand-children) */
@@
-74,15
+70,6
@@
std::vector<Host*> NetZone::get_all_hosts()
return pimpl_->get_all_hosts();
}
return pimpl_->get_all_hosts();
}
-void NetZone::getHosts(std::vector<Host*>* whereto)
-{
- for (auto const& card : pimpl_->get_vertices()) {
- Host* host = 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();
int NetZone::get_host_count()
{
return pimpl_->get_host_count();
@@
-105,10
+92,6
@@
void NetZone::add_bypass_route(kernel::routing::NetPoint* src, kernel::routing::
{
pimpl_->add_bypass_route(src, dst, gw_src, gw_dst, link_list, symmetrical);
}
{
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
} // namespace s4u
} // namespace simgrid