Remove 'using namespace foo;' in headers

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

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index dd70811..56361f7 100644 (file)
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -4,8 +4,9 @@
 /* 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 "network_ns3.hpp"
-#include "surf_private.h"
+#include "src/surf/network_ns3.hpp"
+#include "src/surf/surf_private.h"
+#include "src/surf/host_interface.hpp"
 #include "simgrid/sg_config.h"
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
@@ -39,13 +40,14 @@ static void replace_lat_ns3(char ** lat)
   xbt_free(temp);
 }
 
-static void parse_ns3_add_host(sg_platf_host_cbarg_t host)
+static void simgrid_ns3_add_host(Host* host)
 {
-  XBT_DEBUG("NS3_ADD_HOST '%s'",host->id);
+  const char* id = host->getName();
+  XBT_DEBUG("NS3_ADD_HOST '%s'", id);
   xbt_lib_set(host_lib,
-              host->id,
+              id,
               NS3_HOST_LEVEL,
-              ns3_add_host(host->id)
+              ns3_add_host(id)
     );
 }
 
@@ -66,24 +68,22 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
                                      link->properties);
 }
 
-static void parse_ns3_add_router(sg_platf_router_cbarg_t router)
+static void simgrid_ns3_add_router(RoutingEdge* router)
 {
-  XBT_DEBUG("NS3_ADD_ROUTER '%s'",router->id);
+  const char* router_id = router->getName();
+  XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
   xbt_lib_set(as_router_lib,
-              router->id,
+              router_id,
               NS3_ASR_LEVEL,
-              ns3_add_router(router->id)
+              ns3_add_router(router_id)
     );
 }
 
-static void parse_ns3_add_AS(sg_platf_AS_cbarg_t AS)
+static void parse_ns3_add_AS(As* as)
 {
-  XBT_DEBUG("NS3_ADD_AS '%s'",AS->id);
-  xbt_lib_set(as_router_lib,
-              AS->id,
-              NS3_ASR_LEVEL,
-              ns3_add_AS(AS->id)
-    );
+  const char* as_id = as->p_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) );
 }
 
 static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
@@ -240,11 +240,13 @@ static void parse_ns3_end_platform(void)
 
 static void define_callbacks_ns3(void)
 {
-  sg_platf_host_add_cb (&parse_ns3_add_host);
-  sg_platf_router_add_cb (&parse_ns3_add_router);
+  hostCreatedCallbacks.connect(simgrid_ns3_add_host);
+  routingEdgeCreatedCallbacks.connect(simgrid_ns3_add_router);
   sg_platf_link_add_cb (&parse_ns3_add_link);
   sg_platf_cluster_add_cb (&parse_ns3_add_cluster);
-  sg_platf_AS_begin_add_cb (&parse_ns3_add_AS);
+
+  asCreatedCallbacks.connect(parse_ns3_add_AS);
+
   sg_platf_postparse_add_cb(&create_ns3_topology); //get_one_link_routes
   sg_platf_postparse_add_cb(&parse_ns3_end_platform); //InitializeRoutes
 }
@@ -270,7 +272,7 @@ void surf_network_model_init_NS3()
 
   surf_network_model = new NetworkNS3Model();
 
-  xbt_dynar_push(model_list, &surf_network_model);
+  xbt_dynar_push(all_existing_models, &surf_network_model);
 }
 
 NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
@@ -305,7 +307,9 @@ Link* NetworkNS3Model::createLink(const char *name,
     XBT_INFO("The NS3 network model doesn't support latency state traces");
   if (state_trace)
     XBT_INFO("The NS3 network model doesn't support link state traces");
-  return new NetworkNS3Link(this, name, properties, bw_initial, lat_initial);
+  Link* link = new NetworkNS3Link(this, name, properties, bw_initial, lat_initial);
+  surf_callback_emit(networkLinkCreatedCallbacks, link);
+  return link;
 }
 
 xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdge *src, RoutingEdge *dst)
@@ -471,7 +475,7 @@ int NetworkNS3Action::unref()
 {
   m_refcount--;
   if (!m_refcount) {
-       if (actionHook::is_linked())
+       if (action_hook.is_linked())
          p_stateSet->erase(p_stateSet->iterator_to(*this));
     XBT_DEBUG ("Removing action %p", this);
        delete this;