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
[trace] merging instr_variables.c into instr_interface.c (code re-organization)
[simgrid.git]
/
src
/
msg
/
gos.c
diff --git
a/src/msg/gos.c
b/src/msg/gos.c
index
ba361cc
..
c272f1e
100644
(file)
--- a/
src/msg/gos.c
+++ b/
src/msg/gos.c
@@
-67,7
+67,7
@@
MSG_error_t MSG_task_execute(m_task_t task)
simdata->computation_amount);
SIMIX_req_host_execution_set_priority(simdata->compute, simdata->priority);
#ifdef HAVE_TRACING
simdata->computation_amount);
SIMIX_req_host_execution_set_priority(simdata->compute, simdata->priority);
#ifdef HAVE_TRACING
- SIMIX_req_
host_execution_
set_category(simdata->compute, task->category);
+ SIMIX_req_set_category(simdata->compute, task->category);
#endif
self->simdata->waiting_action = simdata->compute;
#endif
self->simdata->waiting_action = simdata->compute;
@@
-409,12
+409,12
@@
msg_comm_t MSG_task_isend(m_task_t task, const char *alias)
t_simdata->refcount++;
msg_global->sent_msg++;
t_simdata->refcount++;
msg_global->sent_msg++;
- process->simdata->waiting_task = task;
+
//
process->simdata->waiting_task = task;
/* Send it by calling SIMIX network layer */
return SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
/* Send it by calling SIMIX network layer */
return SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
- t_simdata->rate, task, sizeof(void *),
+ t_simdata->rate, task, sizeof(void *),
NULL,
&t_simdata->comm);
}
&t_simdata->comm);
}
@@
-444,7
+444,7
@@
msg_comm_t MSG_task_irecv(m_task_t * task, const char *alias)
("MSG_task_get() was asked to write in a non empty task struct.");
/* Try to receive it by calling SIMIX network layer */
("MSG_task_get() was asked to write in a non empty task struct.");
/* Try to receive it by calling SIMIX network layer */
- return SIMIX_req_comm_irecv(rdv, task, NULL);
+ return SIMIX_req_comm_irecv(rdv, task, NULL
, NULL, NULL
);
}
/** \ingroup msg_gos_functions
}
/** \ingroup msg_gos_functions
@@
-498,7
+498,6
@@
MSG_error_t MSG_comm_wait(msg_comm_t comm, double timeout)
task = (m_task_t) SIMIX_req_comm_get_src_buff(comm);
task->simdata->refcount--;
}
task = (m_task_t) SIMIX_req_comm_get_src_buff(comm);
task->simdata->refcount--;
}
- SIMIX_req_comm_destroy(comm);
/* FIXME: these functions are not tracable */
}
/* FIXME: these functions are not tracable */
}