Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / s4u / s4u_netzone.cpp

diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index f539136..33dbf91 100644 (file)
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -20,6 +20,8 @@ simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kern
                           kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
                           std::vector<surf::LinkImpl*>* link_list)>
     NetZone::onRouteCreation;
+simgrid::xbt::signal<void(NetZone&)> NetZone::onCreation;
+simgrid::xbt::signal<void(NetZone&)> NetZone::onSeal;
 
 NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
 {
@@ -39,7 +41,7 @@ NetZone::~NetZone()
   xbt_free(name_);
 }
 
-std::unordered_map<std::string, std::string>* NetZone::properties()
+std::unordered_map<std::string, std::string>* NetZone::getProperties()
 {
   return simgrid::simix::kernelImmediate([this] {
       return &properties_;
@@ -47,7 +49,7 @@ std::unordered_map<std::string, std::string>* NetZone::properties()
 }
 
 /** Retrieve the property value (or nullptr if not set) */
-const char* NetZone::property(const char* key)
+const char* NetZone::getProperty(const char* key)
 {
   return properties_.at(key).c_str();
 }
@@ -58,20 +60,20 @@ void NetZone::setProperty(const char* key, const char* value)
   });
 }
 
-std::vector<NetZone*>* NetZone::children()
+std::vector<NetZone*>* NetZone::getChildren()
 {
   return children_;
 }
-char* NetZone::name()
+char* NetZone::getCname()
 {
   return name_;
 }
-NetZone* NetZone::father()
+NetZone* NetZone::getFather()
 {
   return father_;
 }
 
-void NetZone::hosts(std::vector<s4u::Host*>* whereto)
+void NetZone::getHosts(std::vector<s4u::Host*>* whereto)
 {
   for (auto card : vertices_) {
     s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());