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] Don't mix public/private data members
[simgrid.git]
/
src
/
s4u
/
s4u_Netzone.cpp
diff --git
a/src/s4u/s4u_Netzone.cpp
b/src/s4u/s4u_Netzone.cpp
index
a039355
..
2e13264
100644
(file)
--- a/
src/s4u/s4u_Netzone.cpp
+++ b/
src/s4u/s4u_Netzone.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2006-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-20
20
. 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. */
/* 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. */
@@
-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,29
+19,24
@@
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) */
-std::vector<NetZone*> NetZone::get_children()
+std::vector<NetZone*> NetZone::get_children()
const
{
std::vector<NetZone*> res;
for (auto child : *(pimpl_->get_children()))
{
std::vector<NetZone*> res;
for (auto child : *(pimpl_->get_children()))
@@
-69,7
+62,7
@@
NetZone* NetZone::get_father()
* Only the hosts that are directly contained in this NetZone are retrieved,
* not the ones contained in sub-netzones.
*/
* Only the hosts that are directly contained in this NetZone are retrieved,
* not the ones contained in sub-netzones.
*/
-std::vector<Host*> NetZone::get_all_hosts()
+std::vector<Host*> NetZone::get_all_hosts()
const
{
return pimpl_->get_all_hosts();
}
{
return pimpl_->get_all_hosts();
}
@@
-106,7
+99,7
@@
sg_netzone_t sg_zone_get_root()
return simgrid::s4u::Engine::get_instance()->get_netzone_root();
}
return simgrid::s4u::Engine::get_instance()->get_netzone_root();
}
-const char* sg_zone_get_name(sg_netzone_t netzone)
+const char* sg_zone_get_name(
const_
sg_netzone_t netzone)
{
return netzone->get_cname();
}
{
return netzone->get_cname();
}
@@
-116,24
+109,24
@@
sg_netzone_t sg_zone_get_by_name(const char* name)
return simgrid::s4u::Engine::get_instance()->netzone_by_name_or_null(name);
}
return simgrid::s4u::Engine::get_instance()->netzone_by_name_or_null(name);
}
-void sg_zone_get_sons(sg_netzone_t netzone, xbt_dict_t whereto)
+void sg_zone_get_sons(
const_
sg_netzone_t netzone, xbt_dict_t whereto)
{
for (auto const& elem : netzone->get_children()) {
{
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));
}
}
}
}
-const char* sg_zone_get_property_value(sg_netzone_t netzone, const char* name)
+const char* sg_zone_get_property_value(
const_
sg_netzone_t netzone, const char* name)
{
return netzone->get_property(name);
}
{
return netzone->get_property(name);
}
-void sg_zone_set_property_value(sg_netzone_t netzone, const char* name, char* value)
+void sg_zone_set_property_value(sg_netzone_t netzone, const char* name, c
onst c
har* value)
{
netzone->set_property(name, value);
}
{
netzone->set_property(name, value);
}
-void sg_zone_get_hosts(sg_netzone_t netzone, xbt_dynar_t whereto)
+void sg_zone_get_hosts(
const_
sg_netzone_t netzone, xbt_dynar_t whereto)
{
/* converts vector to dynar */
std::vector<simgrid::s4u::Host*> hosts = netzone->get_all_hosts();
{
/* converts vector to dynar */
std::vector<simgrid::s4u::Host*> hosts = netzone->get_all_hosts();