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
This example does not work for the moment on windows
[simgrid.git]
/
src
/
msg
/
msg_mailbox.c
diff --git
a/src/msg/msg_mailbox.c
b/src/msg/msg_mailbox.c
index
fad007c
..
6700ed7
100644
(file)
--- a/
src/msg/msg_mailbox.c
+++ b/
src/msg/msg_mailbox.c
@@
-72,10
+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;
- smx_action_t comm = NULL;
-#ifdef HAVE_TRACING
- double start_time = 0;
-#endif
/* We no longer support getting a task from a specific host */
if (host)
THROW_UNIMPLEMENTED;
@@
-83,23
+79,21
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
CHECK_HOST();
#ifdef HAVE_TRACING
TRACE_msg_task_get_start();
- start_time = MSG_get_clock();
+
double
start_time = MSG_get_clock();
#endif
/* Sanity check */
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);
- SIMIX_req_comm_destroy(comm);
- DEBUG2("Got task %s from %p",(*task)->name,mailbox);
- (*task)->simdata->refcount--;
+ 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) {
switch (e.category) {
@@
-113,18
+107,18
@@
MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t * task,
ret = MSG_TIMEOUT;
break;
default:
- xbt_backtrace_display(&e);
- xbt_die(bprintf("Unhandled SIMIX network exception: %s", e.msg));
+ RETHROW;
}
xbt_ex_free(e);
}
- if (ret != MSG_HOST_FAILURE &&
- ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) {
#ifdef HAVE_TRACING
+ if (ret != MSG_HOST_FAILURE &&
+ ret != MSG_TRANSFER_FAILURE &&
+ ret != MSG_TIMEOUT) {
TRACE_msg_task_get_end(start_time, *task);
-#endif
}
+#endif
MSG_RETURN(ret);
}
@@
-136,7
+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();
+ 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();
@@
-145,29
+141,32
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST()
#endif
-
/* Prepare the task to send */
t_simdata = task->simdata;
t_simdata->sender = process;
t_simdata->source = MSG_host_self();
- xbt_assert0(t_simdata->
refcount == 1
,
+ xbt_assert0(t_simdata->
isused == 0
,
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
- t_simdata->
refcount++
;
+ 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 {
- t_simdata->comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
- t_simdata->rate, task, sizeof(void *), NULL, task);
#ifdef HAVE_TRACING
- SIMIX_req_set_category(t_simdata->comm, task->category);
+ comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
+ t_simdata->rate, task, sizeof(void *), NULL, NULL, 0);
+ t_simdata->comm = comm;
+ SIMIX_req_set_category(comm, task->category);
+ 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
- SIMIX_req_comm_wait(t_simdata->comm, timeout);
- SIMIX_req_comm_destroy(t_simdata->comm);
}
CATCH(e) {
@@
-182,15
+181,15
@@
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task,
ret = MSG_TIMEOUT;
break;
default:
-
xbt_die(bprintf("Unhandled SIMIX network exception: %s", e.msg))
;
+
RETHROW
;
}
xbt_ex_free(e);
- /*
Decrement the refcount only on failu
re */
- t_simdata->
refcount--
;
+ /*
If the send failed, it is not used anymo
re */
+ 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();