/* Mailboxes in MSG */
-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
msg_task_t MSG_mailbox_get_head(msg_mailbox_t mailbox)
{
- smx_action_t comm = simcall_rdv_get_head(mailbox);
+ smx_synchro_t comm = simcall_rdv_get_head(mailbox);
if (!comm)
return NULL;
if (host)
THROW_UNIMPLEMENTED;
-#ifdef HAVE_TRACING
TRACE_msg_task_get_start();
double start_time = MSG_get_clock();
-#endif
/* Sanity check */
xbt_assert(task, "Null pointer for the task storage");
/* Try to receive it by calling SIMIX network layer */
TRY {
- simcall_comm_recv(mailbox, task, NULL, NULL, NULL, NULL, timeout, rate);
+ simcall_comm_recv(MSG_process_self(), mailbox, task, NULL, NULL, NULL, NULL, timeout, rate);
XBT_DEBUG("Got task %s from %p",(*task)->name,mailbox);
if (msg_global->debug_multiple_use && (*task)->simdata->isused!=0)
xbt_ex_free(*(xbt_ex_t*)(*task)->simdata->isused);
case timeout_error:
ret = MSG_TIMEOUT;
break;
+ case host_error:
+ ret = MSG_HOST_FAILURE;
+ break;
default:
RETHROW;
}
xbt_ex_free(e);
}
-#ifdef HAVE_TRACING
if (ret != MSG_HOST_FAILURE &&
ret != MSG_TRANSFER_FAILURE &&
ret != MSG_TIMEOUT) {
TRACE_msg_task_get_end(start_time, *task);
}
-#endif
MSG_RETURN(ret);
}
MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, msg_task_t task,
double timeout)
{
- xbt_ex_t e;
msg_error_t ret = MSG_OK;
simdata_task_t t_simdata = NULL;
msg_process_t process = MSG_process_self();
simdata_process_t p_simdata = SIMIX_process_self_get_data(process);
-#ifdef HAVE_TRACING
int call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST()
-#endif
/* Prepare the task to send */
t_simdata = task->simdata;
p_simdata->waiting_task = task;
+ xbt_ex_t e;
/* Try to send it by calling SIMIX network layer */
TRY {
- smx_action_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call */
- comm = simcall_comm_isend(mailbox, t_simdata->message_size,
+ smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call */
+ comm = simcall_comm_isend(SIMIX_process_self(), mailbox,t_simdata->bytes_amount,
t_simdata->rate, task, sizeof(void *),
NULL, NULL, NULL, task, 0);
-#ifdef HAVE_TRACING
- if (TRACE_is_enabled()) {
+ if (TRACE_is_enabled())
simcall_set_category(comm, task->category);
- }
-#endif
t_simdata->comm = comm;
simcall_comm_wait(comm, timeout);
}
p_simdata->waiting_task = NULL;
-#ifdef HAVE_TRACING
if (call_end)
TRACE_msg_task_put_end();
-#endif
MSG_RETURN(ret);
}