X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/992ddb7c22e2cb7dfe8509b3f947ba00c45f6af5..b96ca38c1b2f4ac542ae921e3645f78c640765fc:/src/surf/AsImpl.hpp diff --git a/src/surf/AsImpl.hpp b/src/surf/AsImpl.hpp index 50da4a232a..2e498580c7 100644 --- a/src/surf/AsImpl.hpp +++ b/src/surf/AsImpl.hpp @@ -6,13 +6,10 @@ #ifndef SIMGRID_SURF_AS_HPP #define SIMGRID_SURF_AS_HPP -#include "xbt/base.h" #include "xbt/graph.h" #include "simgrid/s4u/forward.hpp" #include "simgrid/s4u/As.hpp" -#include -#include #include "src/surf/xml/platf_private.hpp" // FIXME: kill sg_platf_route_cbarg_t to remove that UGLY include @@ -48,7 +45,7 @@ public: * Things are rather complex here because we have to find the path from ASes to ASes, and within each. * In addition, the different ASes may use differing routing models. * Some ASes may be routed in full, others may have only some connection information and use a shortest path on top of that, and so on. - * Some ASes may even not have any predefined links and use only coordinate informations to compute the latency. + * Some ASes may even not have any predefined links and use only coordinate information to compute the latency. * * So, the path is constructed recursively, with each traversed AS adding its information to the set. * The algorithm for that is explained in http://hal.inria.fr/hal-00650233/ @@ -70,11 +67,10 @@ public: enum class RoutingMode { unset = 0, /**< Undefined type */ base, /**< Base case: use simple link lists for routing */ - recursive /**< Recursive case: also return gateway informations */ + recursive /**< Recursive case: also return gateway information */ }; /* FIXME: protect the following fields once the construction madness is sorted out */ RoutingMode hierarchy_ = RoutingMode::unset; - xbt_dynar_t upDownLinks = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); surf::NetCard *netcard_ = nullptr; // Our representative in the father AS };