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
Insane amount of debugs
[simgrid.git]
/
src
/
simix
/
smx_action.c
diff --git
a/src/simix/smx_action.c
b/src/simix/smx_action.c
index
d20336a
..
b136398
100644
(file)
--- a/
src/simix/smx_action.c
+++ b/
src/simix/smx_action.c
@@
-50,6
+50,7
@@
smx_action_t SIMIX_action_communicate(smx_host_t sender,smx_host_t receiver,char
receiver->simdata->host, size, rate);
surf_workstation_resource->common_public->action_set_data(simdata->surf_action,act);
receiver->simdata->host, size, rate);
surf_workstation_resource->common_public->action_set_data(simdata->surf_action,act);
+ DEBUG1("Create communicate action %p",act);
return act;
}
return act;
}
@@
-84,6
+85,7
@@
smx_action_t SIMIX_action_execute(smx_host_t host, char * name, double amount)
surf_workstation_resource->common_public->action_set_data(simdata->surf_action,act);
surf_workstation_resource->common_public->action_set_data(simdata->surf_action,act);
+ DEBUG1("Create execute action %p",act);
return act;
}
return act;
}
@@
-118,6
+120,7
@@
smx_action_t SIMIX_action_sleep(smx_host_t host, double duration)
surf_workstation_resource->common_public->action_set_data(simdata->surf_action,act);
surf_workstation_resource->common_public->action_set_data(simdata->surf_action,act);
+ DEBUG1("Create sleep action %p",act);
return act;
}
return act;
}
@@
-131,6
+134,7
@@
void SIMIX_action_cancel(smx_action_t action)
{
xbt_assert0((action != NULL), "Invalid parameter");
{
xbt_assert0((action != NULL), "Invalid parameter");
+ DEBUG1("Cancel action %p",action);
if(action->simdata->surf_action) {
surf_workstation_resource->common_public->action_cancel(action->simdata->surf_action);
}
if(action->simdata->surf_action) {
surf_workstation_resource->common_public->action_cancel(action->simdata->surf_action);
}
@@
-167,6
+171,7
@@
void SIMIX_action_destroy(smx_action_t action)
xbt_assert1((xbt_fifo_size(action->cond_list)==0),
"Conditional list not empty %d. There is a problem. Cannot destroy it now!", xbt_fifo_size(action->cond_list));
xbt_assert1((xbt_fifo_size(action->cond_list)==0),
"Conditional list not empty %d. There is a problem. Cannot destroy it now!", xbt_fifo_size(action->cond_list));
+ DEBUG1("Destroy action %p",action);
if(action->name) xbt_free(action->name);
xbt_fifo_free(action->cond_list);
if(action->name) xbt_free(action->name);
xbt_fifo_free(action->cond_list);
@@
-190,6
+195,7
@@
void SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond)
{
xbt_assert0( (action != NULL) && (cond != NULL), "Invalid parameters");
{
xbt_assert0( (action != NULL) && (cond != NULL), "Invalid parameters");
+ DEBUG2("Register action %p to condtion %p",action,cond);
xbt_fifo_push(cond->actions,action);
}
xbt_fifo_push(cond->actions,action);
}
@@
-225,3
+231,9
@@
smx_action_t SIMIX_action_parallel_execute(char *name, int workstation_nb, void
return act;
}
return act;
}
+e_surf_action_state_t SIMIX_action_get_state(smx_action_t action)
+{
+ xbt_assert0((action != NULL), "Invalid parameter");
+ return surf_workstation_resource->common_public->action_get_state(action->simdata->surf_action);
+
+}