*** empty log message ***

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

diff --git a/src/surf/network.c b/src/surf/network.c
index bd29038..23f6467 100644 (file)
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -311,7 +311,8 @@ static void update_actions_state(double now, double delta)
        action->latency = 0.0;
       }
       if ((action->latency == 0.0) && !(action->suspended)) 
        action->latency = 0.0;
       }
       if ((action->latency == 0.0) && !(action->suspended)) 

-       lmm_update_variable_weight(maxmin_system, action->variable, 1.0);
+       lmm_update_variable_weight(maxmin_system, action->variable, 
+                                  action->lat_current);

     }
     surf_double_update(&(action->generic_action.remains),
        lmm_variable_getvalue(action->variable) * deltap);
     }
     surf_double_update(&(action->generic_action.remains),
        lmm_variable_getvalue(action->variable) * deltap);

diff --git a/src/surf/workstation_KCCFLN05.c b/src/surf/workstation_KCCFLN05.c
index f0ba1e6..bc7a682 100644 (file)
--- a/src/surf/workstation_KCCFLN05.c
+++ b/src/surf/workstation_KCCFLN05.c
@@ -257,8 +257,13 @@ static void update_actions_state(double now, double delta)
        surf_double_update(&(deltap), action->latency);
        action->latency = 0.0;
       }
        surf_double_update(&(deltap), action->latency);
        action->latency = 0.0;
       }

-      if ((action->latency == 0.0) && !(action->suspended))
-       lmm_update_variable_weight(maxmin_system, action->variable, 1.0);
+      if ((action->latency == 0.0) && !(action->suspended)) {
+       if((action)->lat_current==0.0)
+         lmm_update_variable_weight(maxmin_system,action->variable, 1.0);
+       else
+         lmm_update_variable_weight(maxmin_system, action->variable, 
+                                    action->lat_current);
+      }

     }
     surf_double_update(&(action->generic_action.remains),
                       lmm_variable_getvalue(action->variable) * deltap);
     }
     surf_double_update(&(action->generic_action.remains),
                       lmm_variable_getvalue(action->variable) * deltap);