Merge branch 'condvar'

[simgrid.git] / src / surf / AsImpl.hpp

diff --git a/src/surf/AsImpl.hpp b/src/surf/AsImpl.hpp
index b77bac6..5e64ccd 100644 (file)
--- a/src/surf/AsImpl.hpp
+++ b/src/surf/AsImpl.hpp
@@ -6,20 +6,15 @@
 #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 <vector>
-#include <map>
 
 #include "src/surf/xml/platf_private.hpp" // FIXME: kill sg_platf_route_cbarg_t to remove that UGLY include
 
 namespace simgrid {
-namespace surf {
-  class Link;
-  class NetCard;
+namespace routing {
   class RoutingPlatf; // FIXME: KILLME
 
 /** @brief Autonomous Systems
@@ -28,10 +23,10 @@ namespace surf {
  * In SimGrid, there is a hierarchy of ASes, with a unique root AS (that you can retrieve from the s4u::Engine).
  */
 XBT_PUBLIC_CLASS AsImpl : public s4u::As {
-  friend simgrid::surf::RoutingPlatf;
+  friend simgrid::routing::RoutingPlatf;
 protected:
-  AsImpl(const char *name);
-  ~AsImpl();
+  explicit AsImpl(const char *name);
+  ~AsImpl() override;
   
 public:
   /**
@@ -48,7 +43,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/
@@ -58,24 +53,23 @@ public:
    * @param into Container into which the traversed links should be pushed
    * @param latency Accumulator in which the latencies should be added (caller must set it to 0)
    */
-  virtual void getRouteAndLatency(surf::NetCard *src, surf::NetCard *dst, sg_platf_route_cbarg_t into, double *latency)=0;
+  virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency)=0;
   /** @brief retrieves the list of all routes of size 1 (of type src x dst x Link) */
   virtual xbt_dynar_t getOneLinkRoutes();
-  std::vector<surf::Link*> *getBypassRoute(surf::NetCard *src, surf::NetCard *dst);
+  std::vector<surf::Link*> *getBypassRoute(routing::NetCard *src, routing::NetCard *dst);
 
   virtual void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges)=0;
-  static void getRouteRecursive(surf::NetCard *src, surf::NetCard *dst, /* OUT */ std::vector<surf::Link*> * links, double *latency);
+  static void getRouteRecursive(routing::NetCard *src, routing::NetCard *dst, /* OUT */ std::vector<surf::Link*> * links, double *latency);
 
 
-  enum RoutingKind {
-    ROUTING_NULL = 0,   /**< Undefined type                                   */
-    ROUTING_BASE,       /**< Base case: use simple link lists for routing     */
-    ROUTING_RECURSIVE   /**< Recursive case: also return gateway informations */
+  enum class RoutingMode {
+    unset = 0,  /**< Undefined type                                   */
+    base,       /**< Base case: use simple link lists for routing     */
+    recursive   /**< Recursive case: also return gateway information  */
   };
   /* FIXME: protect the following fields once the construction madness is sorted out */
-  RoutingKind hierarchy_ = ROUTING_NULL;
-  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
+  RoutingMode hierarchy_ = RoutingMode::unset;
+  routing::NetCard *netcard_ = nullptr; // Our representative in the father AS
 };
 
 }}; // Namespace simgrid::s4u