only routed ASes can have bypassRoutes

diff --git a/src/surf/surf_routing.cpp b/src/surf/surf_routing.cpp
index ad2a748..4702142 100644 (file)
--- a/src/surf/surf_routing.cpp
+++ b/src/surf/surf_routing.cpp
@@ -39,8 +39,11 @@ namespace surf {
     xbt_dynar_free(&vertices_);
     xbt_dynar_free(&upDownLinks);
     xbt_free(name_);
     xbt_dynar_free(&vertices_);
     xbt_dynar_free(&upDownLinks);
     xbt_free(name_);

-    if (netcard_)
-      delete netcard_;
+    delete netcard_;
+  }
+  void As::Seal()
+  {
+    sealed_ = true;

   }
 
   sg_platf_route_cbarg_t As::getBypassRoute(NetCard * /*src*/, NetCard * /*dst*/, double * /*lat*/) {
   }
 
   sg_platf_route_cbarg_t As::getBypassRoute(NetCard * /*src*/, NetCard * /*dst*/, double * /*lat*/) {


@@ -55,10 +58,10 @@ namespace surf {
   }
 
   void As::addRoute(sg_platf_route_cbarg_t /*route*/){
   }
 
   void As::addRoute(sg_platf_route_cbarg_t /*route*/){

-    THROW_IMPOSSIBLE; /* No. */
+    xbt_die("AS %s does not accept new routes (wrong class).",name_);

   }
   void As::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){
   }
   void As::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){

-    THROW_IMPOSSIBLE;
+    xbt_die("AS %s does not accept new bypass routes (wrong class).",name_);

   }
 
 }} // namespace simgrid::surf
   }
 
 }} // namespace simgrid::surf

diff --git a/src/surf/surf_routing.hpp b/src/surf/surf_routing.hpp
index 077b435..d87bcb3 100644 (file)
--- a/src/surf/surf_routing.hpp
+++ b/src/surf/surf_routing.hpp
@@ -43,28 +43,29 @@ public:
 };
 
 /** @ingroup SURF_routing_interface
 };
 
 /** @ingroup SURF_routing_interface

- * @brief The Autonomous System (AS) routing interface
+ * @brief Network Autonomous System (AS)

  * @details [TODO]
  */
 class As {
 public:
   As(const char*name);
   /** @brief Close that AS: no more content can be added to it */
  * @details [TODO]
  */
 class As {
 public:
   As(const char*name);
   /** @brief Close that AS: no more content can be added to it */

-  virtual void Seal()=0;
+  virtual void Seal();

   virtual ~As();
 
   virtual ~As();
 

-  char *name_ = nullptr;
-  NetCard *netcard_ = nullptr;
-  As *father_ = nullptr;
-  xbt_dict_t sons_ = xbt_dict_new_homogeneous(NULL);
-
-  xbt_dynar_t vertices_ = xbt_dynar_new(sizeof(char*),NULL); // our content, as known to our graph routing algorithm (maps vertexId -> vertex)
-  xbt_dict_t bypassRoutes_ = nullptr;

   e_surf_routing_hierarchy_t hierarchy_ = SURF_ROUTING_NULL;
   xbt_dynar_t upDownLinks = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
 
   e_surf_routing_hierarchy_t hierarchy_ = SURF_ROUTING_NULL;
   xbt_dynar_t upDownLinks = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL);
 

+  char *name_ = nullptr;
+  NetCard *netcard_ = nullptr; // Our representative in the father AS
+  As *father_ = nullptr;
+  xbt_dict_t sons_ = xbt_dict_new_homogeneous(NULL); // sub-ASes
+  xbt_dynar_t vertices_ = xbt_dynar_new(sizeof(char*),NULL); // our content, as known to our graph routing algorithm (maps vertexId -> vertex)

 
 

+private:
+  bool sealed_ = false; // We cannot add more content when sealed

 
 

+public:

   /**
    * @brief Probe the routing path between two points
    *
   /**
    * @brief Probe the routing path between two points
    *

diff --git a/src/surf/surf_routing_cluster.hpp b/src/surf/surf_routing_cluster.hpp
index e58bb7e..bd2da0a 100644 (file)
--- a/src/surf/surf_routing_cluster.hpp
+++ b/src/surf/surf_routing_cluster.hpp
@@ -27,7 +27,6 @@ class XBT_PRIVATE AsCluster;
 class AsCluster: public AsNone {
 public:
   AsCluster(const char*name);
 class AsCluster: public AsNone {
 public:
   AsCluster(const char*name);

-  void Seal() override {}; // nothing to do

 
   virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;
 
   virtual void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) override;

diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp
index 9a51912..61afe49 100644 (file)
--- a/src/surf/surf_routing_floyd.cpp
+++ b/src/surf/surf_routing_floyd.cpp
@@ -37,8 +37,6 @@ AsFloyd::~AsFloyd(){
       routing_route_free(TO_FLOYD_LINK(i, j));
     }
   xbt_free(linkTable_);
       routing_route_free(TO_FLOYD_LINK(i, j));
     }
   xbt_free(linkTable_);

-  /* Delete bypass dict */
-  xbt_dict_free(&bypassRoutes_);

   /* Delete predecessor and cost table */
   xbt_free(predecessorTable_);
   xbt_free(costTable_);
   /* Delete predecessor and cost table */
   xbt_free(predecessorTable_);
   xbt_free(costTable_);

diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp
index a83fb94..3d7651c 100644 (file)
--- a/src/surf/surf_routing_generic.cpp
+++ b/src/surf/surf_routing_generic.cpp
@@ -38,7 +38,6 @@ namespace surf {
 AsGeneric::AsGeneric(const char*name)
   : AsNone(name)
 {
 AsGeneric::AsGeneric(const char*name)
   : AsNone(name)
 {

-  bypassRoutes_ = xbt_dict_new_homogeneous((void (*)(void *)) routing_route_free);

 }
 
 AsGeneric::~AsGeneric()
 }
 
 AsGeneric::~AsGeneric()

diff --git a/src/surf/surf_routing_generic.hpp b/src/surf/surf_routing_generic.hpp
index 9f4d275..9d762b3 100644 (file)
--- a/src/surf/surf_routing_generic.hpp
+++ b/src/surf/surf_routing_generic.hpp
@@ -31,6 +31,8 @@ public:
 protected:
   void getRouteCheckParams(NetCard *src, NetCard *dst);
   void addRouteCheckParams(sg_platf_route_cbarg_t route);
 protected:
   void getRouteCheckParams(NetCard *src, NetCard *dst);
   void addRouteCheckParams(sg_platf_route_cbarg_t route);

+private:
+  xbt_dict_t bypassRoutes_ = xbt_dict_new_homogeneous((void (*)(void *)) routing_route_free);

 };
 
 }
 };
 
 }

diff --git a/src/surf/surf_routing_none.cpp b/src/surf/surf_routing_none.cpp
index cfb4587..8ff5272 100644 (file)
--- a/src/surf/surf_routing_none.cpp
+++ b/src/surf/surf_routing_none.cpp
@@ -22,10 +22,8 @@ xbt_dynar_t AsNone::getOneLinkRoutes() {
 }
 
 void AsNone::getRouteAndLatency(NetCard * /*src*/, NetCard * /*dst*/,
 }
 
 void AsNone::getRouteAndLatency(NetCard * /*src*/, NetCard * /*dst*/,

-                                sg_platf_route_cbarg_t /*res*/, double *lat)
-{
-  *lat = 0.0;
-}
+                                sg_platf_route_cbarg_t /*res*/, double */*lat*/)
+{}

 
 void AsNone::getGraph(xbt_graph_t /*graph*/, xbt_dict_t /*nodes*/, xbt_dict_t /*edges*/)
 {
 
 void AsNone::getGraph(xbt_graph_t /*graph*/, xbt_dict_t /*nodes*/, xbt_dict_t /*edges*/)
 {

diff --git a/src/surf/surf_routing_none.hpp b/src/surf/surf_routing_none.hpp
index 3c471b1..6a82602 100644 (file)
--- a/src/surf/surf_routing_none.hpp
+++ b/src/surf/surf_routing_none.hpp
@@ -18,7 +18,6 @@ namespace surf {
 class XBT_PRIVATE AsNone : public As {
 public:
   AsNone(const char*name);
 class XBT_PRIVATE AsNone : public As {
 public:
   AsNone(const char*name);

-  void Seal() override {}; // nothing to do

   ~AsNone();
 
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   ~AsNone();
 
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;

diff --git a/src/surf/surf_routing_vivaldi.hpp b/src/surf/surf_routing_vivaldi.hpp
index 9e607ba..003b942 100644 (file)
--- a/src/surf/surf_routing_vivaldi.hpp
+++ b/src/surf/surf_routing_vivaldi.hpp
@@ -26,7 +26,6 @@ class XBT_PRIVATE AsVivaldi;
 class AsVivaldi: public AsGeneric {
 public:
   AsVivaldi(const char *name);
 class AsVivaldi: public AsGeneric {
 public:
   AsVivaldi(const char *name);

-  void Seal() override {}; // nothing to do

   ~AsVivaldi() {};
 
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;
   ~AsVivaldi() {};
 
   void getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t into, double *latency) override;