A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[simgrid.git]
/
src
/
surf
/
network.c
diff --git
a/src/surf/network.c
b/src/surf/network.c
index
738a096
..
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);
@@
-468,7
+469,7
@@
static void action_resume(surf_action_t action)
{
lmm_update_variable_weight(maxmin_system,
((surf_action_network_CM02_t) action)->variable,
{
lmm_update_variable_weight(maxmin_system,
((surf_action_network_CM02_t) action)->variable,
-
action
->lat_current);
+
((surf_action_network_CM02_t) action)
->lat_current);
((surf_action_network_CM02_t) action)->suspended = 0;
}
((surf_action_network_CM02_t) action)->suspended = 0;
}