this deserves the palm of the worst code of the week

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index b03529f..d958942 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -75,13 +75,6 @@ static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
     );
 }
 
-static void parse_ns3_add_AS(simgrid::s4u::As* as)
-{
-  const char* as_id = as->name();
-  XBT_DEBUG("NS3_ADD_AS '%s'", as_id);
-  xbt_lib_set(as_router_lib, as_id, NS3_ASR_LEVEL, ns3_add_AS(as_id) );
-}
-
 #include "src/surf/xml/platf.hpp" // FIXME: move that back to the parsing area
 static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
 {
@@ -234,7 +227,6 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
   simgrid::surf::netcardCreatedCallbacks.connect(simgrid_ns3_add_router);
   simgrid::surf::on_link.connect(netlink_parse_init);
   simgrid::surf::on_cluster.connect (&parse_ns3_add_cluster);
-  simgrid::surf::asCreatedCallbacks.connect(parse_ns3_add_AS);
   simgrid::surf::on_postparse.connect(&create_ns3_topology); //get_one_link_routes
   simgrid::surf::on_postparse.connect(&ns3_end_platform); //InitializeRoutes
 
@@ -544,12 +536,6 @@ void ns3_add_cluster(char * bw,char * lat,const char *id)
   XBT_DEBUG("Number of nodes in Cluster_nodes: %d",Cluster_nodes.GetN());
 }
 
-void * ns3_add_AS(const char * id)
-{
-  XBT_DEBUG("Interface ns3 add AS '%s'",id);
-  return NULL;
-}
-
 static char* transformIpv4Address (ns3::Ipv4Address from){
   std::stringstream sstream;
   sstream << from ;

diff --git a/src/surf/ns3/ns3_interface.h b/src/surf/ns3/ns3_interface.h
index e17edbf..b0eb1bb 100644 (file)
--- a/src/surf/ns3/ns3_interface.h
+++ b/src/surf/ns3/ns3_interface.h
@@ -43,7 +43,6 @@ XBT_PUBLIC(void)   ns3_create_flow(const char* a,const char *b,double start,u_in
 XBT_PUBLIC(void)   ns3_simulator(double min);
 XBT_PUBLIC(void *) ns3_add_host_cluster(const char * id);
 XBT_PUBLIC(void *) ns3_add_router(const char * id);
-XBT_PUBLIC(void *) ns3_add_AS(const char * id);
 XBT_PUBLIC(void) ns3_add_link(int src, e_ns3_network_element_type_t type_src,
                 int dst, e_ns3_network_element_type_t type_dst,
                 char * bw,char * lat);