Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
[NS3] force NS3 simulator advances when surf advances (when NS3 has no flows)
authorLucas Schnorr <Lucas.Schnorr@imag.fr>
Thu, 8 Sep 2011 08:17:39 +0000 (10:17 +0200)
committerLucas Schnorr <Lucas.Schnorr@imag.fr>
Thu, 8 Sep 2011 14:56:11 +0000 (16:56 +0200)
src/surf/network_ns3.c

index 86c1aa1..61e9d07 100644 (file)
@@ -444,8 +444,12 @@ static void ns3_update_actions_state(double now, double delta)
              surf_network_model->states.running_action_set;
 
          /* If there are no running flows, just return */
-         if (!xbt_swag_size(running_actions))
-               return;
+         if (!xbt_swag_size(running_actions)) {
+           while(ns3_time()<now) {
+             ns3_simulator(now-ns3_time());
+           }
+           return;
+         }
 
          xbt_dict_foreach(dict_socket,cursor,key,data){
            action = (surf_action_network_ns3_t)ns3_get_socket_action(data);