X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec4e2d87d99b8ad76c9096033eb858e9052b09fa..6b82b4a34d483044a998d21291e34428226cf8e1:/src/surf/surf_routing_none.cpp

diff --git a/src/surf/surf_routing_none.cpp b/src/surf/surf_routing_none.cpp
index 28c64fb237..cfb4587272 100644
--- a/src/surf/surf_routing_none.cpp
+++ b/src/surf/surf_routing_none.cpp
@@ -4,17 +4,18 @@
 /* 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 simgrid::surf::AsNone();
-}
-
 namespace simgrid {
 namespace surf {
+AsNone::AsNone(const char*name)
+  : As(name)
+{}
+AsNone::~AsNone()
+{}
 
 xbt_dynar_t AsNone::getOneLinkRoutes() {
   return NULL;
@@ -28,50 +29,7 @@ void AsNone::getRouteAndLatency(NetCard * /*src*/, NetCard * /*dst*/,
 
 void AsNone::getGraph(xbt_graph_t /*graph*/, xbt_dict_t /*nodes*/, xbt_dict_t /*edges*/)
 {
-	XBT_INFO("No routing no graph");
-}
-
-sg_platf_route_cbarg_t AsNone::getBypassRoute(NetCard * /*src*/, NetCard * /*dst*/, double * /*lat*/) {
-  return NULL;
-}
-
-int AsNone::parsePU(NetCard *elm) {
-  XBT_DEBUG("Load process unit \"%s\"", elm->getName());
-  xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm);
-  /* don't care about PUs */
-  return -1;
-}
-
-int AsNone::parseAS(NetCard *elm) {
-  XBT_DEBUG("Load Autonomous system \"%s\"", elm->getName());
-  xbt_dynar_push_as(p_indexNetworkElm, NetCard*, elm);
-  /* even don't care about sub-ASes -- I'm as nihilist as an old punk*/
-  return -1;
+  XBT_INFO("No routing no graph");
 }
-
-void AsNone::parseRoute(sg_platf_route_cbarg_t /*route*/){
-  THROW_IMPOSSIBLE;
-}
-
-void AsNone::parseASroute(sg_platf_route_cbarg_t /*route*/){
-  THROW_IMPOSSIBLE;
-}
-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);
-}
-
 }
 }