From: Lucas Schnorr <Lucas.Schnorr@imag.fr>
Date: Fri, 2 Sep 2011 15:17:48 +0000 (+0200)
Subject: [NS3] cosmetics, removing tracing code and fixing indentation
X-Git-Tag: v3_6_2~161
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/610c3c7da1460fd53dd41646ea988a57ad35baf0

[NS3] cosmetics, removing tracing code and fixing indentation
---

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index 50936abf11..db84ca0e70 100644
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -437,33 +437,13 @@ static void ns3_update_actions_state(double now, double delta)
 	  	return;
 
 	  xbt_dict_foreach(dict_socket,cursor,key,data){
-		action = (surf_action_t)ns3_get_socket_action(data);
-		action->remains = ns3_get_socket_remains(data);
-
-//#ifdef HAVE_TRACING
-//      if (TRACE_is_enabled()) {
-//        double amount_sent = (action->generic_action.cost - action->generic_action.remains);
-//
-//        // tracing resource utilization
-//        xbt_dynar_t route = global_routing->get_route(action->src_name,
-//                                                      action->dst_name);
-//        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,
-//                                           (surf_action_t) action,
-//                                           (amount_sent - last_amount_sent)/(delta),
-//                                           now-delta,
-//                                           delta);
-//        }
-//      }
-//#endif
-
-		if(ns3_get_socket_is_finished(data) == 1){
-			action->finish = now;
-			surf_action_state_set(action, SURF_ACTION_DONE);
-		}
+	    action = (surf_action_t)ns3_get_socket_action(data);
+	    action->remains = ns3_get_socket_remains(data);
+
+	    if(ns3_get_socket_is_finished(data) == 1){
+	      action->finish = now;
+	      surf_action_state_set(action, SURF_ACTION_DONE);
+	    }
 	  }
 	  return;
 }