optimize perf - part 2

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

diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index ea2f37c..153be09 100644 (file)
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -23,7 +23,13 @@ simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kern
 
 NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
 {
+  for (auto card : vertices_) {
+    s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
+    if (host != nullptr)
+      hosts_->push_back(host);
+  }
 }
+
 void NetZone::seal()
 {
   sealed_ = true;
@@ -32,7 +38,7 @@ NetZone::~NetZone()
 {
   xbt_dict_cursor_t cursor = nullptr;
   char* key;
-  NetZone_t elem;
+  NetZone* elem;
   xbt_dict_foreach (children_, cursor, key, elem) {
     delete static_cast<NetZone*>(elem);
   }
@@ -42,7 +48,7 @@ NetZone::~NetZone()
 }
 std::unordered_map<std::string, std::string>* NetZone::properties()
 {
-  return simgrid::simix::kernelImmediate([=] {
+  return simgrid::simix::kernelImmediate([this] {
       return &properties_;
   });
 }
@@ -54,7 +60,7 @@ const char* NetZone::property(const char* key)
 }
 void NetZone::setProperty(const char* key, const char* value)
 {
-  simgrid::simix::kernelImmediate([=,&key,&value] {
+  simgrid::simix::kernelImmediate([this,key,value] {
     properties_[key] = value;
   });
 }
@@ -72,16 +78,9 @@ NetZone* NetZone::father()
   return father_;
 }
 
-xbt_dynar_t NetZone::hosts()
+std::vector<s4u::Host*>* NetZone::hosts()
 {
-  xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
-
-  for (auto card : vertices_) {
-    s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
-    if (host != nullptr)
-      xbt_dynar_push(res, &host);
-  }
-  return res;
+  return hosts_;
 }
 
 int NetZone::addComponent(kernel::routing::NetPoint* elm)