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
Simplify the management of processes in MSG.
[simgrid.git]
/
src
/
msg
/
msg_mailbox.c
diff --git
a/src/msg/msg_mailbox.c
b/src/msg/msg_mailbox.c
index
97af3a1
..
6700ed7
100644
(file)
--- a/
src/msg/msg_mailbox.c
+++ b/
src/msg/msg_mailbox.c
@@
-72,7
+72,6
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
{
xbt_ex_t e;
MSG_error_t ret = MSG_OK;
- volatile smx_action_t comm = NULL;
/* We no longer support getting a task from a specific host */
if (host)
THROW_UNIMPLEMENTED;
@@
-87,15
+86,13
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
xbt_assert0(task, "Null pointer for the task storage");
if (*task)
- CRITICAL0
+ XBT_CRITICAL
("MSG_task_get() was asked to write in a non empty task struct.");
/* Try to receive it by calling SIMIX network layer */
TRY {
- comm = SIMIX_req_comm_irecv(mailbox, task, NULL, NULL, NULL);
- SIMIX_req_comm_wait(comm, timeout);
- (*task)->simdata->comm = comm;
- DEBUG2("Got task %s from %p",(*task)->name,mailbox);
+ SIMIX_req_comm_recv(mailbox, task, NULL, NULL, NULL, timeout);
+ XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
(*task)->simdata->isused=0;
}
CATCH(e) {
@@
-114,9
+111,6
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
}
xbt_ex_free(e);
}
- if (comm != NULL) {
- //SIMIX_req_comm_destroy(comm);
- }
#ifdef HAVE_TRACING
if (ret != MSG_HOST_FAILURE &&
@@
-136,8
+130,9
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
MSG_error_t ret = MSG_OK;
simdata_task_t t_simdata = NULL;
m_process_t process = MSG_process_self();
-
volatile smx_action_t comm = NULL
;
+
simdata_process_t p_simdata = SIMIX_process_self_get_data()
;
#ifdef HAVE_TRACING
+ volatile smx_action_t comm = NULL;
int call_end = 0;
#endif
CHECK_HOST();
@@
-157,17
+152,21
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
t_simdata->isused=1;
msg_global->sent_msg++;
- process->simdata->waiting_task = task;
+
+ p_simdata->waiting_task = task;
/* Try to send it by calling SIMIX network layer */
TRY {
+#ifdef HAVE_TRACING
comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
-
t_simdata->rate, task, sizeof(void *), NULL, NULL, 0);
+ t_simdata->rate, task, sizeof(void *), NULL, NULL, 0);
t_simdata->comm = comm;
-#ifdef HAVE_TRACING
SIMIX_req_set_category(comm, task->category);
-#endif
SIMIX_req_comm_wait(comm, timeout);
+#else
+ SIMIX_req_comm_send(mailbox, t_simdata->message_size,
+ t_simdata->rate, task, sizeof(void*), NULL, NULL, timeout);
+#endif
}
CATCH(e) {
@@
-187,14
+186,10
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
xbt_ex_free(e);
/* If the send failed, it is not used anymore */
- t_simdata->isused=0;
- }
-
- if (comm != NULL) {
- //SIMIX_req_comm_destroy(comm);
+ t_simdata->isused = 0;
}
- p
rocess->
simdata->waiting_task = NULL;
+ p
_
simdata->waiting_task = NULL;
#ifdef HAVE_TRACING
if (call_end)
TRACE_msg_task_put_end();