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
It's the least I can do in a cancel function...
[simgrid.git]
/
src
/
surf
/
surf_action.c
diff --git
a/src/surf/surf_action.c
b/src/surf/surf_action.c
index
a3d5d55
..
d77ca45
100644
(file)
--- a/
src/surf/surf_action.c
+++ b/
src/surf/surf_action.c
@@
-20,7
+20,9
@@
const char *surf_action_state_names[6] = {
"SURF_ACTION_NOT_IN_THE_SYSTEM"
};
"SURF_ACTION_NOT_IN_THE_SYSTEM"
};
-void* surf_action_new(size_t size,double cost,surf_model_t model,int failed) {
+void *surf_action_new(size_t size, double cost, surf_model_t model,
+ int failed)
+{
surf_action_t action = xbt_malloc0(size);
action->refcount = 1;
action->cost = cost;
surf_action_t action = xbt_malloc0(size);
action->refcount = 1;
action->cost = cost;
@@
-63,18
+65,18
@@
double surf_action_get_start_time(surf_action_t action)
double surf_action_get_finish_time(surf_action_t action)
{
double surf_action_get_finish_time(surf_action_t action)
{
- return action->finish;
+ /* keep the function behavior, some models (cpu_ti) change the finish time before the action end */
+ return action->remains == 0 ? action->finish : -1;
}
}
-void surf_action_free(surf_action_t * action)
+
XBT_INLINE
void surf_action_free(surf_action_t * action)
{
(*action)->model_type->action_cancel(*action);
free(*action);
*action = NULL;
}
{
(*action)->model_type->action_cancel(*action);
free(*action);
*action = NULL;
}
-void surf_action_state_set(surf_action_t action,
- e_surf_action_state_t state)
+void surf_action_state_set(surf_action_t action, e_surf_action_state_t state)
{
surf_action_state_t action_state = &(action->model_type->states);
XBT_IN2("(%p,%s)", action, surf_action_state_names[state]);
{
surf_action_state_t action_state = &(action->model_type->states);
XBT_IN2("(%p,%s)", action, surf_action_state_names[state]);
@@
-101,10
+103,11
@@
void surf_action_data_set(surf_action_t action, void *data)
action->data = data;
}
action->data = data;
}
-void surf_action_ref(surf_action_t action)
+
XBT_INLINE
void surf_action_ref(surf_action_t action)
{
action->refcount++;
}
{
action->refcount++;
}
+
/*
void surf_action_suspend(surf_action_t action)
{
/*
void surf_action_suspend(surf_action_t action)
{