removing misplaced code (was moved from here before routing update)

[simgrid.git] / src / surf / network.c

diff --git a/src/surf/network.c b/src/surf/network.c
index 88232f0..3e1f2f0 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -324,17 +324,6 @@ static void net_update_actions_state(double now, double delta)
    */
 
   xbt_swag_foreach_safe(action, next_action, running_actions) {
-#ifdef HAVE_TRACING
-// COMMENTED BY DAVID
-//     xbt_dynar_t route = used_routing->get_route(action->src, action->dst);
-//     
-//     link_CM02_t link;
-//     unsigned int i;
-//     xbt_dynar_foreach(route, i, link) {
-//             TRACE_surf_link_set_utilization (link->lmm_resource.generic_resource.name,
-//           action->generic_action.data, lmm_variable_getvalue(action->variable), now-delta, delta);
-//     }
-#endif
     deltap = delta;
     if (action->latency > 0) {
       if (action->latency > deltap) {
@@ -484,7 +473,7 @@ static void net_update_resource_state(void *id,
 
 
 static surf_action_t net_communicate(const char *src_name, const char *dst_name,
-                                 int src, int dst, double size, double rate)
+                                 double size, double rate)
 {
   unsigned int i;
   link_CM02_t link;
@@ -495,13 +484,11 @@ static surf_action_t net_communicate(const char *src_name, const char *dst_name,
      Add a link_CM02_t *link and a int link_nb to network_card_CM02_t. It will represent local links for this node
      Use the cluster_id for ->id */
 
-  //xbt_dynar_t route = used_routing->get_route(src, dst);  // COMMENTED BY DAVID
   xbt_dynar_t route = global_routing->get_route(src_name, dst_name);
   xbt_dynar_t back_route = NULL;
   int constraints_per_variable = 0;
 
   if( sg_network_fullduplex == 1){
-         //back_route = used_routing->get_route(dst, src);  // COMMENTED BY DAVID
          back_route = global_routing->get_route(src_name, dst_name);
   }
   
@@ -596,9 +583,7 @@ static surf_action_t net_communicate(const char *src_name, const char *dst_name,
   }  /* LARGE PLATFORMS HACK:
      expand also with src->link and dst->link */
 
-  /* saving the src and dst of this communication */
-  action->src = src;
-  action->dst = dst;
+
 
   XBT_OUT;
 
@@ -649,8 +634,6 @@ static void net_finalize(void)
 {
   surf_model_exit(surf_network_model);
   surf_network_model = NULL;
-
-  //used_routing->finalize(); // COMMENTED BY DAVID
   
   global_routing->finalize();