fix jedule and do the right thing for netzone hosts

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

diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index e2149e6..780baad 100644 (file)
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -24,6 +24,7 @@ simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kern
 NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
 {
 }
 NetZone::NetZone(NetZone* father, const char* name) : father_(father), name_(xbt_strdup(name))
 {
 }

+

 void NetZone::seal()
 {
   sealed_ = true;
 void NetZone::seal()
 {
   sealed_ = true;


@@ -37,6 +38,7 @@ NetZone::~NetZone()
     delete static_cast<NetZone*>(elem);
   }
 
     delete static_cast<NetZone*>(elem);
   }
 

+  delete hosts_;

   xbt_dict_free(&children_);
   xbt_free(name_);
 }
   xbt_dict_free(&children_);
   xbt_free(name_);
 }


@@ -72,16 +74,14 @@ NetZone* NetZone::father()
   return 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)
   for (auto card : vertices_) {
     s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
     if (host != nullptr)

-      xbt_dynar_push(res, &host);
+      hosts_->push_back(host);

   }
   }

-  return res;
+  return hosts_;

 }
 
 int NetZone::addComponent(kernel::routing::NetPoint* elm)
 }
 
 int NetZone::addComponent(kernel::routing::NetPoint* elm)