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
[sonar] Constify pointer and reference local variables in src/s4u/.
[simgrid.git]
/
src
/
s4u
/
s4u_Netzone.cpp
diff --git
a/src/s4u/s4u_Netzone.cpp
b/src/s4u/s4u_Netzone.cpp
index
cb45e8e
..
b5cdbce
100644
(file)
--- a/
src/s4u/s4u_Netzone.cpp
+++ b/
src/s4u/s4u_Netzone.cpp
@@
-9,8
+9,6
@@
#include "simgrid/s4u/NetZone.hpp"
#include "simgrid/zone.h"
#include "simgrid/s4u/NetZone.hpp"
#include "simgrid/zone.h"
-XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_netzone, "S4U Networking Zones");
-
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
@@
-21,25
+19,20
@@
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
pimpl_->get_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 p
roperties_.at(key).c_str(
);
+ return p
impl_->get_property(key
);
}
}
+
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] { pimpl_->set_property(key, value)
; });
}
/** @brief Returns the list of direct children (no grand-children) */
}
/** @brief Returns the list of direct children (no grand-children) */
@@
-74,15
+67,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
+89,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
@@
-132,7
+112,7
@@
sg_netzone_t sg_zone_get_by_name(const char* name)
void sg_zone_get_sons(sg_netzone_t netzone, xbt_dict_t whereto)
{
for (auto const& elem : netzone->get_children()) {
void sg_zone_get_sons(sg_netzone_t netzone, xbt_dict_t whereto)
{
for (auto const& elem : netzone->get_children()) {
- xbt_dict_set(whereto, elem->get_cname(), static_cast<void*>(elem)
, nullptr
);
+ xbt_dict_set(whereto, elem->get_cname(), static_cast<void*>(elem));
}
}
}
}