X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1d56048a731508dcb0d38937132533c10ecc0655..919f4502f5e39049ce71245b7fcca16e3781800d:/src/surf/network_ns3.c

diff --git a/src/surf/network_ns3.c b/src/surf/network_ns3.c
index 8777c009f7..86c1aa1388 100644
--- a/src/surf/network_ns3.c
+++ b/src/surf/network_ns3.c
@@ -27,7 +27,7 @@ static double time_to_next_flow_completion = -1;
 static double ns3_share_resources(double min);
 static void ns3_update_actions_state(double now, double delta);
 static void finalize(void);
-static surf_action_t communicate(const char *src_name,
+static surf_action_t ns3_communicate(const char *src_name,
                                  const char *dst_name, double size, double rate);
 static void action_suspend(surf_action_t action);
 static void action_resume(surf_action_t action);
@@ -349,6 +349,13 @@ static int ns3_get_link_latency_limited(surf_action_t action)
 }
 #endif
 
+#ifdef HAVE_TRACING
+static void ns3_action_set_category(surf_action_t action, const char *category)
+{
+  action->category = xbt_strdup (category);
+}
+#endif
+
 void surf_network_model_init_NS3(const char *filename)
 {
 	if (surf_network_model)
@@ -368,10 +375,15 @@ void surf_network_model_init_NS3(const char *filename)
 	surf_network_model->resume = action_resume;
 	surf_network_model->is_suspended = action_is_suspended;
 	surf_network_model->action_unref = action_unref;
-	surf_network_model->extension.network.communicate = communicate;
+	surf_network_model->extension.network.communicate = ns3_communicate;
+
+#ifdef HAVE_TRACING
+  surf_network_model->set_category = ns3_action_set_category;
+#endif
 
 	/* Added the initialization for NS3 interface */
-	if (ns3_initialize()) {
+
+	if (ns3_initialize(xbt_cfg_get_string(_surf_cfg_set,"ns3/TcpModel"))) {
 	xbt_die("Impossible to initialize NS3 interface");
 	}
 
@@ -405,20 +417,19 @@ static double ns3_share_resources(double min)
 	  surf_network_model->states.running_action_set;
 
 	//get the first relevant value from the running_actions list
-	if (!xbt_swag_size(running_actions))
-	return -1.0;
-
-	ns3_simulator(min);
-	time_to_next_flow_completion = ns3_time() - surf_get_clock();
-
-//	XBT_INFO("min       : %f",min);
-//	XBT_INFO("ns3  time : %f",ns3_time());
-//	XBT_INFO("surf time : %f",surf_get_clock());
+	if (!xbt_swag_size(running_actions) || min == 0.0)
+	  return -1.0;
+	else
+	 do {
+	   ns3_simulator(min);
+	   time_to_next_flow_completion = ns3_time() - surf_get_clock();
+	 } while(time_to_next_flow_completion==0.0);
+
+	XBT_DEBUG("min       : %f",min);
+	XBT_DEBUG("ns3  time : %f",ns3_time());
+	XBT_DEBUG("surf time : %f",surf_get_clock());
+	XBT_DEBUG("Next completion %f :",time_to_next_flow_completion);
 
-	xbt_assert(time_to_next_flow_completion,
-			  "Time to next flow completion not initialized!\n");
-
-	XBT_DEBUG("ns3_share_resources return %f",time_to_next_flow_completion);
 	return time_to_next_flow_completion;
 }
 
@@ -428,7 +439,7 @@ static void ns3_update_actions_state(double now, double delta)
 	  char *key;
 	  void *data;
 
-	  surf_action_t action = NULL;
+	  surf_action_network_ns3_t action = NULL;
 	  xbt_swag_t running_actions =
 	      surf_network_model->states.running_action_set;
 
@@ -437,27 +448,55 @@ 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);
-		if(ns3_get_socket_is_finished(data) == 1){
-			action->finish = now;
-			surf_action_state_set(action, SURF_ACTION_DONE);
-		}
+	    action = (surf_action_network_ns3_t)ns3_get_socket_action(data);
+	    action->generic_action.remains = action->generic_action.cost - ns3_get_socket_sent(data);
+
+#ifdef HAVE_TRACING
+	    if (TRACE_is_enabled() &&
+	        surf_action_state_get(&(action->generic_action)) == SURF_ACTION_RUNNING){
+	      double data_sent = ns3_get_socket_sent(data);
+	      double data_delta_sent = data_sent - action->last_sent;
+
+	      xbt_dynar_t route = global_routing->get_route(action->src_name, action->dst_name);
+	      unsigned int i;
+	      for (i = 0; i < xbt_dynar_length (route); i++){
+	        surf_ns3_link_t *link = ((surf_ns3_link_t*)xbt_dynar_get_ptr (route, i));
+	        TRACE_surf_link_set_utilization ((*link)->generic_resource.name,
+	            action->generic_action.data,
+	            (surf_action_t) action,
+	            (data_delta_sent)/delta,
+	            now-delta,
+	            delta);
+	      }
+	      action->last_sent = data_sent;
+	    }
+#endif
+
+	    if(ns3_get_socket_is_finished(data) == 1){
+	      action->generic_action.finish = now;
+	      surf_action_state_set(&(action->generic_action), SURF_ACTION_DONE);
+	    }
 	  }
 	  return;
 }
 
 /* Max durations are not supported */
-static surf_action_t communicate(const char *src_name,
+static surf_action_t ns3_communicate(const char *src_name,
                                  const char *dst_name, double size, double rate)
 {
-  surf_action_t action = NULL;
+  surf_action_network_ns3_t action = NULL;
 
   XBT_DEBUG("Communicate from %s to %s",src_name,dst_name);
-  action = surf_action_new(sizeof(s_surf_action_t), size, surf_network_model, 0);
+  action = surf_action_new(sizeof(s_surf_action_network_ns3_t), size, surf_network_model, 0);
 
   ns3_create_flow(src_name, dst_name, surf_get_clock(), size, action);
 
+#ifdef HAVE_TRACING
+  action->last_sent = 0;
+  action->src_name = xbt_strdup (src_name);
+  action->dst_name = xbt_strdup (dst_name);
+#endif
+
   return (surf_action_t) action;
 }
 
@@ -484,6 +523,14 @@ static int action_unref(surf_action_t action)
   action->refcount--;
   if (!action->refcount) {
     xbt_swag_remove(action, action->state_set);
+
+#ifdef HAVE_TRACING
+    xbt_free(((surf_action_network_ns3_t)action)->src_name);
+    xbt_free(((surf_action_network_ns3_t)action)->dst_name);
+    if (action->category)
+      xbt_free(action->category);
+#endif
+
     surf_action_free(&action);
     return 1;
   }