X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3dabc5eb26d7bc8b1e29b3aa52c74368c6bb699..84b6ab29e2861d096c8d500c6bd56289bfe90664:/src/surf/surf.c

diff --git a/src/surf/surf.c b/src/surf/surf.c
index bd4660229c..8acdd3576f 100644
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -134,8 +134,8 @@ s_surf_model_description_t surf_network_model_description[] = {
 #endif
 #ifdef HAVE_NS3
   {"NS3",
-   "TODO",
-   NULL, surf_network_model_init_NS3},
+   "Use NS3 tcp model",
+	NULL, surf_network_model_init_NS3},
 #endif
   {"Reno",
    "Model using lagrange_solve instead of lmm_solve (experts only)", NULL,
@@ -442,14 +442,30 @@ double surf_solve(double max_date)
 
   XBT_DEBUG("Looking for next action end");
   xbt_dynar_foreach(model_list, iter, model) {
-    XBT_DEBUG("Running for Resource [%s]", model->name);
-    model_next_action_end = model->model_private->share_resources(NOW);
-    XBT_DEBUG("Resource [%s] : next action end = %f",
-           model->name, model_next_action_end);
-    if (((min < 0.0) || (model_next_action_end < min))
-        && (model_next_action_end >= 0.0))
-      min = model_next_action_end;
+
+	if(strcmp(model->name,"network NS3") ){
+		XBT_DEBUG("Running for Resource [%s]", model->name);
+		model_next_action_end = model->model_private->share_resources(NOW);
+		XBT_DEBUG("Resource [%s] : next action end = %f",
+			   model->name, model_next_action_end);
+		if (((min < 0.0) || (model_next_action_end < min))
+			&& (model_next_action_end >= 0.0))
+		  min = model_next_action_end;
+	  }
   }
+
+  XBT_DEBUG("Min for other resources : %f", min);
+
+
+  if(surf_network_model->name && !strcmp(surf_network_model->name,"network NS3")){
+	// run until min or next flow
+	model_next_action_end = surf_network_model->model_private->share_resources(min);
+	XBT_DEBUG("Min for NS3 : %f", model_next_action_end);
+	if ( ((min < 0.0) || (model_next_action_end < min)) && ( model_next_action_end >= 0.0 ))
+		min = model_next_action_end;
+  }
+
+
   XBT_DEBUG("Next action end : %f", min);
 
   XBT_DEBUG("Looking for next event");