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
Ooups. I was still using Mb instead of b...:(
[simgrid.git]
/
src
/
surf
/
workstation_KCCFLN05.c
diff --git
a/src/surf/workstation_KCCFLN05.c
b/src/surf/workstation_KCCFLN05.c
index
43ba290
..
8695b1b
100644
(file)
--- a/
src/surf/workstation_KCCFLN05.c
+++ b/
src/surf/workstation_KCCFLN05.c
@@
-252,10
+252,10
@@
static void update_actions_state(double now, double delta)
deltap = delta;
if (action->latency > 0) {
if (action->latency > deltap) {
deltap = delta;
if (action->latency > 0) {
if (action->latency > deltap) {
-
surf_
double_update(&(action->latency), deltap);
+ double_update(&(action->latency), deltap);
deltap = 0.0;
} else {
deltap = 0.0;
} else {
-
surf_
double_update(&(deltap), action->latency);
+ double_update(&(deltap), action->latency);
action->latency = 0.0;
}
if ((action->latency == 0.0) && !(action->suspended)) {
action->latency = 0.0;
}
if ((action->latency == 0.0) && !(action->suspended)) {
@@
-266,10
+266,10
@@
static void update_actions_state(double now, double delta)
action->lat_current);
}
}
action->lat_current);
}
}
-
surf_
double_update(&(action->generic_action.remains),
+ double_update(&(action->generic_action.remains),
lmm_variable_getvalue(action->variable) * deltap);
if (action->generic_action.max_duration != NO_MAX_DURATION)
lmm_variable_getvalue(action->variable) * deltap);
if (action->generic_action.max_duration != NO_MAX_DURATION)
-
surf_
double_update(&(action->generic_action.max_duration), delta);
+ double_update(&(action->generic_action.max_duration), delta);
/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
/* if(action->generic_action.remains<.00001) action->generic_action.remains=0; */
@@
-949,7
+949,7
@@
static void parse_file(const char *file)
if(!ROUTE(i,i).size) {
if(!loopback)
loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
if(!ROUTE(i,i).size) {
if(!loopback)
loopback = network_link_new(xbt_strdup("__MSG_loopback__"),
- 498
.
00, NULL, 0.000015, NULL,
+ 498
0000
00, NULL, 0.000015, NULL,
SURF_NETWORK_LINK_ON, NULL,
SURF_NETWORK_LINK_FATPIPE);
ROUTE(i,i).size=1;
SURF_NETWORK_LINK_ON, NULL,
SURF_NETWORK_LINK_FATPIPE);
ROUTE(i,i).size=1;