X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/588829c9373ff2627445cd0ef63cbb7b593bf565..b78dbc3f5d35226be390f1a1ca500af3c09d7022:/src/s4u/s4u_netzone.cpp

diff --git a/src/s4u/s4u_netzone.cpp b/src/s4u/s4u_netzone.cpp
index a1a0911ee3..e4f6989728 100644
--- a/src/s4u/s4u_netzone.cpp
+++ b/src/s4u/s4u_netzone.cpp
@@ -1,12 +1,12 @@
-/* Copyright (c) 2006-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2017. 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. */
 
 #include "xbt/log.h"
 
+#include "simgrid/s4u/Host.hpp"
 #include "simgrid/s4u/NetZone.hpp"
-#include "simgrid/s4u/host.hpp"
 #include "simgrid/simix.hpp"
 #include "src/kernel/routing/NetPoint.hpp"
 #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
@@ -18,29 +18,29 @@ namespace s4u {
 
 simgrid::xbt::signal<void(bool symmetrical, kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst,
                           kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst,
-                          std::vector<surf::LinkImpl*>* link_list)>
+                          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))
+NetZone::NetZone(NetZone* father, std::string name) : father_(father), name_(name)
 {
+  children_ = new std::vector<NetZone*>();
 }
+
 void NetZone::seal()
 {
   sealed_ = true;
 }
+
 NetZone::~NetZone()
 {
-  xbt_dict_cursor_t cursor = nullptr;
-  char* key;
-  NetZone_t elem;
-  xbt_dict_foreach (children_, cursor, key, elem) {
-    delete static_cast<NetZone*>(elem);
-  }
-
-  xbt_dict_free(&children_);
-  xbt_free(name_);
+  for (auto const& nz : *children_)
+    delete nz;
+  delete children_;
 }
-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_;
@@ -48,7 +48,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();
 }
@@ -59,29 +59,42 @@ void NetZone::setProperty(const char* key, const char* value)
   });
 }
 
-xbt_dict_t NetZone::children()
+/** @brief Returns the list of direct children (no grand-children)
+ *
+ * This function returns the internal copy of the children, not a copy. Don't mess with it!
+ */
+std::vector<NetZone*>* NetZone::getChildren()
 {
   return children_;
 }
-char* NetZone::name()
+
+const char* NetZone::getCname() const
 {
-  return name_;
+  return name_.c_str();
 }
-NetZone* NetZone::father()
+NetZone* NetZone::getFather()
 {
   return father_;
 }
 
-xbt_dynar_t NetZone::hosts()
+void NetZone::getHosts(std::vector<s4u::Host*>* whereto)
 {
-  xbt_dynar_t res = xbt_dynar_new(sizeof(sg_host_t), nullptr);
+  for (auto const& card : vertices_) {
+    s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->getName());
+    if (host != nullptr)
+      whereto->push_back(host);
+  }
+}
 
-  for (auto card : vertices_) {
-    s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->name());
+int NetZone::getHostCount()
+{
+  int count = 0;
+  for (auto const& card : vertices_) {
+    s4u::Host* host = simgrid::s4u::Host::by_name_or_null(card->getName());
     if (host != nullptr)
-      xbt_dynar_push(res, &host);
+      count++;
   }
-  return res;
+  return count;
 }
 
 int NetZone::addComponent(kernel::routing::NetPoint* elm)
@@ -90,9 +103,10 @@ int NetZone::addComponent(kernel::routing::NetPoint* elm)
   return vertices_.size() - 1; // The rank of the newly created object
 }
 
-void NetZone::addRoute(sg_platf_route_cbarg_t /*route*/)
+void NetZone::addRoute(sg_netpoint_t /*src*/, sg_netpoint_t /*dst*/, sg_netpoint_t /*gw_src*/, sg_netpoint_t /*gw_dst*/,
+                       std::vector<simgrid::surf::LinkImpl*>& /*link_list*/, bool /*symmetrical*/)
 {
-  xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_);
+  xbt_die("NetZone '%s' does not accept new routes (wrong class).", name_.c_str());
 }
 }
 }; // namespace simgrid::s4u