X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eff13e323664f224576a26b017543955b3044b05..5ebe65e77d4e95add7d9b429cced2120849ea86e:/src/surf/network_ns3.cpp

diff --git a/src/surf/network_ns3.cpp b/src/surf/network_ns3.cpp
index 84996b1571..f637494675 100644
--- a/src/surf/network_ns3.cpp
+++ b/src/surf/network_ns3.cpp
@@ -11,6 +11,8 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ns3);
 
+int NS3_EXTENSION_ID;
+
 xbt_dynar_t IPV4addr;
 static double time_to_next_flow_completion = -1;
 
@@ -37,11 +39,11 @@ static void replace_lat_ns3(char ** lat)
   xbt_free(temp);
 }
 
-static void simgrid_ns3_add_host(simgrid::surf::Host* host)
+static void simgrid_ns3_add_host(simgrid::Host& host)
 {
-  const char* id = host->getName();
+  const char* id = host.getName().c_str();
   XBT_DEBUG("NS3_ADD_HOST '%s'", id);
-  simgrid::Host::by_name_or_create(id)->set_facet(NS3_HOST_LEVEL, ns3_add_host(id));
+  host.extension_set(NS3_EXTENSION_ID, ns3_add_host(id));
 }
 
 static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
@@ -55,13 +57,13 @@ static void parse_ns3_add_link(sg_platf_link_cbarg_t link)
                                      link->bandwidth_trace,
                                      link->latency,
                                      link->latency_trace,
-                                     link->state,
+                                     link->initiallyOn,
                                      link->state_trace,
                                      link->policy,
                                      link->properties);
 }
 
-static void simgrid_ns3_add_router(simgrid::surf::RoutingEdge* router)
+static void simgrid_ns3_add_router(simgrid::surf::NetCard* router)
 {
   const char* router_id = router->getName();
   XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
@@ -109,7 +111,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
       xbt_dynar_push_as(tab_elements_num, int, start);
       router_id = bprintf("ns3_%s%d%s", cluster_prefix, start, cluster_suffix);
       simgrid::Host::by_name_or_create(router_id)
-        ->set_facet(NS3_HOST_LEVEL, ns3_add_host_cluster(router_id));
+        ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
       XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
       free(router_id);
       break;
@@ -121,7 +123,7 @@ static void parse_ns3_add_cluster(sg_platf_cluster_cbarg_t cluster)
         xbt_dynar_push_as(tab_elements_num, int, i);
         router_id = bprintf("ns3_%s%d%s", cluster_prefix, i, cluster_suffix);
         simgrid::Host::by_name_or_create(router_id)
-          ->set_facet(NS3_HOST_LEVEL, ns3_add_host_cluster(router_id));
+          ->extension_set(NS3_EXTENSION_ID, ns3_add_host_cluster(router_id));
         XBT_DEBUG("NS3_ADD_ROUTER '%s'",router_id);
         free(router_id);
       }
@@ -228,7 +230,7 @@ static void parse_ns3_end_platform(void)
 
 static void define_callbacks_ns3(void)
 {
-  simgrid::surf::hostCreatedCallbacks.connect(simgrid_ns3_add_host);
+  simgrid::Host::onCreation.connect(simgrid_ns3_add_host);
   simgrid::surf::routingEdgeCreatedCallbacks.connect(simgrid_ns3_add_router);
   sg_platf_link_add_cb (&parse_ns3_add_link);
   sg_platf_cluster_add_cb (&parse_ns3_add_cluster);
@@ -271,7 +273,7 @@ NetworkNS3Model::NetworkNS3Model() : NetworkModel() {
   routing_model_create(NULL);
   define_callbacks_ns3();
 
-  NS3_HOST_LEVEL = simgrid::Host::add_level(free_ns3_host);
+  NS3_EXTENSION_ID = simgrid::Host::extension_create(free_ns3_host);
   NS3_ASR_LEVEL  = xbt_lib_add_level(as_router_lib, free_ns3_host);
 }
 
@@ -286,7 +288,7 @@ Link* NetworkNS3Model::createLink(const char *name,
 	                                 tmgr_trace_t bw_trace,
 	                                 double lat_initial,
 	                                 tmgr_trace_t lat_trace,
-	                                 e_surf_resource_state_t state_initial,
+	                                 int initiallyOn,
 	                                 tmgr_trace_t state_trace,
 	                                 e_surf_link_sharing_policy_t policy,
 	                                 xbt_dict_t properties){
@@ -297,11 +299,11 @@ Link* NetworkNS3Model::createLink(const char *name,
   if (state_trace)
     XBT_INFO("The NS3 network model doesn't support link state traces");
   Link* link = new NetworkNS3Link(this, name, properties, bw_initial, lat_initial);
-  surf_callback_emit(networkLinkCreatedCallbacks, link);
+  Link::onCreation(link);
   return link;
 }
 
-xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdge *src, RoutingEdge *dst)
+xbt_dynar_t NetworkNS3Model::getRoute(NetCard *src, NetCard *dst)
 {
   xbt_dynar_t route = NULL;
   routing_get_route_and_latency(src, dst, &route, NULL);
@@ -309,7 +311,7 @@ xbt_dynar_t NetworkNS3Model::getRoute(RoutingEdge *src, RoutingEdge *dst)
   return route;
 }
 
-Action *NetworkNS3Model::communicate(RoutingEdge *src, RoutingEdge *dst,
+Action *NetworkNS3Model::communicate(NetCard *src, NetCard *dst,
 		                               double size, double rate)
 {
   XBT_DEBUG("Communicate from %s to %s", src->getName(), dst->getName());
@@ -320,7 +322,7 @@ Action *NetworkNS3Model::communicate(RoutingEdge *src, RoutingEdge *dst,
   action->m_lastSent = 0;
   action->p_srcElm = src;
   action->p_dstElm = dst;
-  surf_callback_emit(networkCommunicateCallbacks, action, src, dst, size, rate);
+  networkCommunicateCallbacks(action, src, dst, size, rate);
 
   return (surf_action_t) action;
 }