Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

[simgrid.git] / src / surf / surf_action.c

diff --git a/src/surf/surf_action.c b/src/surf/surf_action.c
index 4ae277441cb275ffb5f9a5ee38237d482f57bad5..8d81c51c626f37ee81cdddc15de1fd305babbbcc 100644 (file)
--- a/src/surf/surf_action.c
+++ b/src/surf/surf_action.c
@@ -382,8 +382,10 @@ void update_resource_energy(surf_model_t model, surf_action_lmm_t action)
                                                                                  (model->model_private->maxmin_system,
                                                                                                  action->variable, 0));
 
-       double load = lmm_constraint_get_usage(cpu_model->constraint) / cpu_model->power_peak;
-       cpu_update_energy(cpu_model, load);
+        if( cpu_model->energy->last_updated < surf_get_clock()) {
+               double load = lmm_constraint_get_usage(cpu_model->constraint) / cpu_model->power_peak;
+               cpu_update_energy(cpu_model, load);
+        }
     }
 }