From: schnorr <Lucas.Schnorr@imag.fr>
Date: Thu, 29 Mar 2012 08:23:39 +0000 (+0200)
Subject: [trace] fix tracing of network models
X-Git-Tag: v3_7~159
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/17234fa684f969d78128d6c8cd44c005d69efba0

[trace] fix tracing of network models
---

diff --git a/src/surf/network.c b/src/surf/network.c
index 5afe01f560..c9e0a70ffb 100644
--- a/src/surf/network.c
+++ b/src/surf/network.c
@@ -538,7 +538,10 @@ static void net_update_actions_state_full(double now, double delta)
         link_CM02_t link = lmm_constraint_id(constraint);
         TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
                                         ((surf_action_t)action)->category,
-                                        lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+                                        (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)*
+                                        lmm_get_cnst_weight_from_var(network_maxmin_system,
+                                            GENERIC_LMM_ACTION(action).variable,
+                                            i)),
                                         now - delta,
                                         delta);
       }
@@ -599,7 +602,10 @@ static void net_update_actions_state_lazy(double now, double delta)
         link_CM02_t link = lmm_constraint_id(constraint);
         TRACE_surf_link_set_utilization(link->lmm_resource.generic_resource.name,
                                         ((surf_action_t)action)->category,
-                                        lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable),
+                                        (lmm_variable_getvalue(GENERIC_LMM_ACTION(action).variable)*
+                                            lmm_get_cnst_weight_from_var(network_maxmin_system,
+                                                GENERIC_LMM_ACTION(action).variable,
+                                                i)),
                                         GENERIC_LMM_ACTION(action).last_update,
                                         now - GENERIC_LMM_ACTION(action).last_update);
       }