Fix the weight problem raised by Kayo and confirmed by Loris.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@2164 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/src/surf/network.c b/src/surf/network.c
index 771b7cd..738a096 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -377,6 +377,9 @@ static void update_resource_state(void *id,
       else 
        lmm_update_variable_bound(maxmin_system, action->variable,
                                  min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current)));
       else 
        lmm_update_variable_bound(maxmin_system, action->variable,
                                  min(action->rate,SG_TCP_CTE_GAMMA / (2.0 * action->lat_current)));

+      if(!(action->suspended))
+       lmm_update_variable_weight(maxmin_system, action->variable, 
+                                  action->lat_current);

     }
   } else if (event_type == nw_link->state_event) {
     if (value > 0)
     }
   } else if (event_type == nw_link->state_event) {
     if (value > 0)


@@ -464,7 +467,8 @@ static void action_suspend(surf_action_t action)
 static void action_resume(surf_action_t action)
 {
   lmm_update_variable_weight(maxmin_system,
 static void action_resume(surf_action_t action)
 {
   lmm_update_variable_weight(maxmin_system,

-                            ((surf_action_network_CM02_t) action)->variable, 1.0);
+                            ((surf_action_network_CM02_t) action)->variable, 
+                            action->lat_current);

   ((surf_action_network_CM02_t) action)->suspended = 0;
 }
 
   ((surf_action_network_CM02_t) action)->suspended = 0;
 }