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
Revert part of the last change since it let the make check explode
[simgrid.git]
/
src
/
msg
/
gos.c
diff --git
a/src/msg/gos.c
b/src/msg/gos.c
index
379ca36
..
6b4466b
100644
(file)
--- a/
src/msg/gos.c
+++ b/
src/msg/gos.c
@@
-62,6
+62,8
@@
static MSG_error_t __MSG_task_get_with_time_out_from_host(m_task_t * task,
if(max_duration>0) {
if(!first_time) {
if(max_duration>0) {
if(!first_time) {
+ PAJE_PROCESS_POP_STATE(process);
+ PAJE_COMM_STOP(process,t,channel);
MSG_RETURN(MSG_TRANSFER_FAILURE);
}
}
MSG_RETURN(MSG_TRANSFER_FAILURE);
}
}
@@
-456,6
+458,8
@@
MSG_error_t MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
while(!(task_simdata->comm)) {
if(max_duration>0) {
if(!first_time) {
while(!(task_simdata->comm)) {
if(max_duration>0) {
if(!first_time) {
+ PAJE_PROCESS_POP_STATE(process);
+ PAJE_COMM_STOP(process,task,channel);
MSG_RETURN(MSG_TRANSFER_FAILURE);
}
}
MSG_RETURN(MSG_TRANSFER_FAILURE);
}
}
@@
-471,6
+475,8
@@
MSG_error_t MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
get_state(local_host->simdata->host) == SURF_CPU_OFF) {
xbt_fifo_remove(((simdata_host_t) remote_host->simdata)->mbox[channel],
task);
get_state(local_host->simdata->host) == SURF_CPU_OFF) {
xbt_fifo_remove(((simdata_host_t) remote_host->simdata)->mbox[channel],
task);
+ PAJE_PROCESS_POP_STATE(process);
+ PAJE_COMM_STOP(process,task,channel);
MSG_task_destroy(task);
MSG_RETURN(MSG_HOST_FAILURE);
}
MSG_task_destroy(task);
MSG_RETURN(MSG_HOST_FAILURE);
}