[simix] Make host->{on,off}() do the simcall directly

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

diff --git a/src/surf/network_cm02.cpp b/src/surf/network_cm02.cpp
index 7caca4b..a17692f 100644 (file)
--- a/src/surf/network_cm02.cpp
+++ b/src/surf/network_cm02.cpp
@@ -222,7 +222,7 @@ Link* NetworkCm02Model::createLink(const char *name,
 
   Link* link = new NetworkCm02Link(this, name, properties, p_maxminSystem, sg_bandwidth_factor * bw_initial, history,
                                             state_initial, state_trace, bw_initial, bw_trace, lat_initial, lat_trace, policy);
-  networkLinkCreatedCallbacks(link);
+  Link::onCreation(link);
   return link;
 }
 
@@ -347,7 +347,7 @@ void NetworkCm02Model::updateActionsStateFull(double now, double delta)
   return;
 }
 
-Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst,
+Action *NetworkCm02Model::communicate(NetCard *src, NetCard *dst,
                                                 double size, double rate)
 {
   unsigned int i;
@@ -360,7 +360,7 @@ Action *NetworkCm02Model::communicate(RoutingEdge *src, RoutingEdge *dst,
   xbt_dynar_t back_route = NULL;
   int constraints_per_variable = 0;
 
-  xbt_dynar_t route = xbt_dynar_new(sizeof(RoutingEdge*), NULL);
+  xbt_dynar_t route = xbt_dynar_new(sizeof(NetCard*), NULL);
 
   XBT_IN("(%s,%s,%g,%g)", src->getName(), dst->getName(), size, rate);