#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,
min = max_date - NOW;
}
- XBT_DEBUG("Looking for next action end");
+ XBT_DEBUG("Looking for next action end for all models except NS3");
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("Next action end : %f", min);
- XBT_DEBUG("Looking for next event");
- while ((next_event_date = tmgr_history_next_date(history)) != -1.0) {
+ XBT_DEBUG("Min for resources (except NS3) : %f", min);
+
+ XBT_DEBUG("Looking for next trace event");
+
+ do {
XBT_DEBUG("Next TRACE event : %f", next_event_date);
- if ((min != -1.0) && (next_event_date > NOW + min))
- break;
+
+ next_event_date = tmgr_history_next_date(history);
+
+ if(surf_network_model->name && !strcmp(surf_network_model->name,"network NS3")){
+ if(next_event_date!=-1.0 && min!=-1.0) {
+ min = MIN(next_event_date - NOW, min);
+ } else{
+ min = MAX(next_event_date - NOW, min);
+ }
+
+ XBT_DEBUG("Run for NS3 at most %f", min);
+ // 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(model_next_action_end>=0.0)
+ min = model_next_action_end;
+ }
+
+ if (next_event_date == -1.0) break;
+
+ if ((min != -1.0) && (next_event_date > NOW + min)) break;
+
XBT_DEBUG("Updating models");
while ((event =
tmgr_history_get_next_event_leq(history, next_event_date,
event, value,
NOW + min);
}
- }
-
+ } while (1);
/* FIXME: Moved this test to here to avoid stoping simulation if there are actions running on cpus and all cpus are with availability = 0.
* This may cause an infinite loop if one cpu has a trace with periodicity = 0 and the other a trace with periodicity > 0.