Routing: kill some dupplicated code

[simgrid.git] / src / surf / surf_routing_none.cpp

diff --git a/src/surf/surf_routing_none.cpp b/src/surf/surf_routing_none.cpp
index 4652b56..ddd0dd8 100644 (file)
--- a/src/surf/surf_routing_none.cpp
+++ b/src/surf/surf_routing_none.cpp
@@ -4,20 +4,24 @@
 /* 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 "surf_routing_none.hpp"
+#include "src/surf/surf_routing_private.hpp"
+#include "src/surf/surf_routing_none.hpp"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_none, surf, "Routing part of surf");
 
-AS_t model_none_create(void)
-{
-  return new AsNone();
-}
+namespace simgrid {
+namespace surf {
+AsNone::AsNone(const char*name)
+  : As(name)
+{}
+AsNone::~AsNone()
+{}
 
 xbt_dynar_t AsNone::getOneLinkRoutes() {
   return NULL;
 }
 
-void AsNone::getRouteAndLatency(RoutingEdge * /*src*/, RoutingEdge * /*dst*/,
+void AsNone::getRouteAndLatency(NetCard * /*src*/, NetCard * /*dst*/,
                                 sg_platf_route_cbarg_t /*res*/, double *lat)
 {
   *lat = 0.0;
@@ -25,29 +29,15 @@ void AsNone::getRouteAndLatency(RoutingEdge * /*src*/, RoutingEdge * /*dst*/,
 
 void AsNone::getGraph(xbt_graph_t /*graph*/, xbt_dict_t /*nodes*/, xbt_dict_t /*edges*/)
 {
-       XBT_INFO("No routing no graph");
+  XBT_INFO("No routing no graph");
 }
 
-sg_platf_route_cbarg_t AsNone::getBypassRoute(RoutingEdge * /*src*/, RoutingEdge * /*dst*/, double * /*lat*/) {
+sg_platf_route_cbarg_t AsNone::getBypassRoute(NetCard * /*src*/, NetCard * /*dst*/, double * /*lat*/) {
   return NULL;
 }
 
-int AsNone::parsePU(RoutingEdge *elm) {
-  XBT_DEBUG("Load process unit \"%s\"", elm->getName());
-  xbt_dynar_push_as(p_indexNetworkElm, RoutingEdge*, elm);
-  /* don't care about PUs */
-  return -1;
-}
-
-int AsNone::parseAS(RoutingEdge *elm) {
-  XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName());
-  xbt_dynar_push_as(p_indexNetworkElm, RoutingEdge*, elm);
-  /* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
-  return -1;
-}
-
 void AsNone::parseRoute(sg_platf_route_cbarg_t /*route*/){
-  THROW_IMPOSSIBLE;
+  THROW_IMPOSSIBLE; /* No. */
 }
 
 void AsNone::parseASroute(sg_platf_route_cbarg_t /*route*/){
@@ -57,16 +47,5 @@ void AsNone::parseBypassroute(sg_platf_route_cbarg_t /*e_route*/){
   THROW_IMPOSSIBLE;
 }
 
-/* Creation routing model functions */
-AsNone::AsNone() {
-  p_routingSons = xbt_dict_new_homogeneous(NULL);
-  p_indexNetworkElm = xbt_dynar_new(sizeof(char*),NULL);
-  p_linkUpDownList = NULL;
 }
-
-AsNone::~AsNone() {
-  xbt_dict_free(&p_routingSons);
-  xbt_dynar_free(&p_indexNetworkElm);
-  xbt_dynar_free(&p_linkUpDownList);
 }
-