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
put the log message in the correct place
[simgrid.git]
/
src
/
surf
/
cpu_ti.c
diff --git
a/src/surf/cpu_ti.c
b/src/surf/cpu_ti.c
index
ab3bad8
..
0b9f262
100644
(file)
--- a/
src/surf/cpu_ti.c
+++ b/
src/surf/cpu_ti.c
@@
-681,8
+681,8
@@
static double cpu_ti_action_get_remains(surf_action_t action)
cpu_ti_update_remaining_amount((cpu_ti_t)
((surf_action_cpu_ti_t) action)->cpu,
surf_get_clock());
cpu_ti_update_remaining_amount((cpu_ti_t)
((surf_action_cpu_ti_t) action)->cpu,
surf_get_clock());
- return action->remains;
XBT_OUT();
XBT_OUT();
+ return action->remains;
}
static e_surf_resource_state_t cpu_ti_get_state(void *cpu)
}
static e_surf_resource_state_t cpu_ti_get_state(void *cpu)
@@
-765,7
+765,7
@@
static void surf_cpu_ti_model_init_internal(void)
cpu_ti_modified_cpu =
xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
cpu_ti_modified_cpu =
xbt_swag_new(xbt_swag_offset(cpu, modified_cpu_hookup));
- surf_cpu_model->name = "
CPU_TI
";
+ surf_cpu_model->name = "
cpu_ti
";
surf_cpu_model->action_unref = cpu_ti_action_unref;
surf_cpu_model->action_cancel = cpu_ti_action_cancel;
surf_cpu_model->action_unref = cpu_ti_action_unref;
surf_cpu_model->action_cancel = cpu_ti_action_cancel;