Remove unuse variables

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

diff --git a/src/surf/network_gtnets.c b/src/surf/network_gtnets.c
index 6580578..693db62 100644 (file)
--- a/src/surf/network_gtnets.c
+++ b/src/surf/network_gtnets.c
@@ -132,18 +132,17 @@ static void parse_link_init(void)
 /* Create the gtnets topology based on routing strategy */
 static void create_gtnets_topology()
 {
-  xbt_dict_cursor_t cursor = NULL;
-  char *key, *data;
-
 // COMMENTED BY DAVID
+//  xbt_dict_cursor_t cursor = NULL;
+//  char *key, *data;
 //   xbt_dict_t onelink_routes = used_routing->get_onelink_routes();
 //   xbt_assert0(onelink_routes, "Error onelink_routes was not initialized");
-// 
+//
 //   DEBUG0("Starting topology generation");
-// 
+//
 //   xbt_dict_foreach(onelink_routes, cursor, key, data){
 //     s_onelink_t link = (s_onelink_t) data;
-// 
+//
 //     DEBUG3("Link (#%d), src (#%d), dst (#%d)", ((network_link_GTNETS_t)(link->link_ptr))->id , link->src_id, link->dst_id);
 //     DEBUG0("Calling one link route");
 //     if(used_routing->is_router(link->src_id)){
@@ -154,7 +153,7 @@ static void create_gtnets_topology()
 //     }
 //     route_onehop_new(link->src_id, link->dst_id, (network_link_GTNETS_t)(link->link_ptr));
 //   }
-// 
+//
 //   xbt_dict_free(&route_table);
 //   if (XBT_LOG_ISENABLED(surf_network_gtnets, xbt_log_priority_debug)) {
 //       gtnets_print_topology();
@@ -265,20 +264,6 @@ static void update_actions_state(double now, double delta)
         trace_sent = action->generic_action.cost;
       }
       // tracing resource utilization
-<<<<<<< HEAD
-      int src = TRACE_surf_gtnets_get_src (action);
-      int dst = TRACE_surf_gtnets_get_dst (action);
-      if (src != -1 && dst != -1){
-        xbt_dynar_t route = used_routing->get_route(src, dst);
-        network_link_GTNETS_t link;
-        unsigned int i;
-        xbt_dynar_foreach(route, i, link) {
-               TRACE_surf_link_set_utilization (link->generic_resource.name,
-            action->generic_action.data, trace_sent/delta, now-delta, delta);
-        }
-      }
-=======
-      
 // COMMENTED BY DAVID
 //       int src = TRACE_surf_gtnets_get_src (action);
 //       int dst = TRACE_surf_gtnets_get_dst (action);
@@ -287,12 +272,10 @@ static void update_actions_state(double now, double delta)
 //         network_link_GTNETS_t link;
 //         unsigned int i;
 //         xbt_dynar_foreach(route, i, link) {
-// 
 //             TRACE_surf_link_set_utilization (link->generic_resource.name,
-//             action->generic_action.data, (action->generic_action.remains-remain)/delta, now-delta, delta);
+//             action->generic_action.data, trace_sent/delta, now-delta, delta);
 //         }
 //       }
->>>>>>> I comment all the calls to used_routing, in order to use global routing.
 #endif
 
       DEBUG1("Sent value returned by GTNetS : %f", sent);