X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9735863c1ccb1ae8b55853262d6e1c3ee3a8698f..aa3426ffe35e9f09e17b5f09ee1264263b0a61b4:/src/s4u/s4u_as.cpp

diff --git a/src/s4u/s4u_as.cpp b/src/s4u/s4u_as.cpp
index 60459e6d73..a86951c5b1 100644
--- a/src/s4u/s4u_as.cpp
+++ b/src/s4u/s4u_as.cpp
@@ -4,9 +4,11 @@
 /* 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 <xbt/log.h>
+
+#include <simgrid/s4u/host.hpp>
+#include <simgrid/s4u/As.hpp>
 
-#include "simgrid/s4u/As.hpp"
 #include "src/surf/surf_routing.hpp"
 #include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
 
@@ -15,17 +17,16 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_as,"S4U autonomous systems");
 namespace simgrid {
   namespace s4u {
 
-    As::As(const char *name)
-    : name_(xbt_strdup(name))
-    {
+  As::As(As* father, const char* name) : father_(father), name_(xbt_strdup(name))
+  {
     }
-    void As::Seal()
+    void As::seal()
     {
       sealed_ = true;
     }
     As::~As()
     {
-      xbt_dict_cursor_t cursor = NULL;
+      xbt_dict_cursor_t cursor = nullptr;
       char *key;
       AS_t elem;
       xbt_dict_foreach(children_, cursor, key, elem) {
@@ -34,7 +35,6 @@ namespace simgrid {
 
 
       xbt_dict_free(&children_);
-      xbt_dynar_free(&vertices_);
       for (auto &kv : bypassRoutes_)
         delete kv.second;
       xbt_free(name_);
@@ -54,20 +54,19 @@ namespace simgrid {
 
     xbt_dynar_t As::hosts()
     {
-      xbt_dynar_t res =  xbt_dynar_new(sizeof(sg_host_t), NULL);
+      xbt_dynar_t res =  xbt_dynar_new(sizeof(sg_host_t), nullptr);
 
-      for (unsigned int index = 0; index < xbt_dynar_length(vertices_); index++) {
-        simgrid::surf::NetCard *card = xbt_dynar_get_as(vertices_, index, simgrid::surf::NetCard*);
-        simgrid::s4u::Host     *host = simgrid::s4u::Host::by_name_or_null(card->name());
-        if (host!=NULL)
+      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;
     }
 
-    int As::addComponent(surf::NetCard *elm) {
-      xbt_dynar_push_as(vertices_, surf::NetCard*, elm);
-      return xbt_dynar_length(vertices_)-1;
+    int As::addComponent(kernel::routing::NetCard *elm) {
+      vertices_.push_back(elm);
+      return vertices_.size()-1; // The rank of the newly created object
     }
 
     void As::addRoute(sg_platf_route_cbarg_t /*route*/){
@@ -75,21 +74,24 @@ namespace simgrid {
     }
 
     void As::addBypassRoute(sg_platf_route_cbarg_t e_route){
-      const char *src = e_route->src;
-      const char *dst = e_route->dst;
-
       /* Argument validity checks */
       if (e_route->gw_dst) {
         XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s",
-            src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
+            e_route->src->name(), e_route->gw_src->name(),
+            e_route->dst->name(), e_route->gw_dst->name());
         xbt_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.",
-            src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
-        xbt_assert(bypassRoutes_.find({src,dst}) == bypassRoutes_.end(), "The bypass route between %s@%s and %s@%s already exists.",
-            src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
+            e_route->src->name(), e_route->gw_src->name(),
+            e_route->dst->name(), e_route->gw_dst->name());
+        xbt_assert(bypassRoutes_.find({e_route->src->name(),e_route->dst->name()}) == bypassRoutes_.end(),
+            "The bypass route between %s@%s and %s@%s already exists.",
+            e_route->src->name(), e_route->gw_src->name(), e_route->dst->name(), e_route->gw_dst->name());
       } else {
-        XBT_DEBUG("Load bypassRoute from %s to %s", src, dst);
-        xbt_assert(!e_route->link_list->empty(),                         "Bypass route between %s and %s cannot be empty.",    src, dst);
-        xbt_assert(bypassRoutes_.find({src,dst}) == bypassRoutes_.end(), "The bypass route between %s and %s already exists.", src, dst);
+        XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->name(), e_route->dst->name());
+        xbt_assert(!e_route->link_list->empty(),                         "Bypass route between %s and %s cannot be empty.",
+            e_route->src->name(), e_route->dst->name());
+        xbt_assert(bypassRoutes_.find({e_route->src->name(),e_route->dst->name()}) == bypassRoutes_.end(),
+            "The bypass route between %s and %s already exists.",
+            e_route->src->name(), e_route->dst->name());
       }
 
       /* Build a copy that will be stored in the dict */
@@ -98,7 +100,7 @@ namespace simgrid {
         newRoute->push_back(link);
 
       /* Store it */
-      bypassRoutes_.insert({{src,dst}, newRoute});
+      bypassRoutes_.insert({{e_route->src->name(),e_route->dst->name()}, newRoute});
     }
 
 }  }; // namespace simgrid::s4u