/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "mailbox.h"
-#include "msg/private.h"
+#include "msg_mailbox.h"
+#include "msg_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_mailbox, msg,
"Logging specific to MSG (mailbox)");
msg_mailbox_t MSG_mailbox_get_by_channel(m_host_t host,
m_channel_t channel)
{
- xbt_assert0((host != NULL), "Invalid host");
- xbt_assert1((channel >= 0)
+ xbt_assert((host != NULL), "Invalid host");
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
{
xbt_ex_t e;
MSG_error_t ret = MSG_OK;
- volatile 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;
CHECK_HOST();
#ifdef HAVE_TRACING
TRACE_msg_task_get_start();
- start_time = MSG_get_clock();
+ volatile double start_time = MSG_get_clock();
#endif
/* Sanity check */
- xbt_assert0(task, "Null pointer for the task storage");
+ xbt_assert(task, "Null pointer for the task storage");
if (*task)
- CRITICAL0
- ("MSG_task_get() was asked to write in a non empty task struct.");
+ XBT_WARN
+ ("Asked to write the received task in a non empty struct -- proceeding.");
/* 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) {
}
xbt_ex_free(e);
}
- if (comm != NULL) {
- SIMIX_req_comm_destroy(comm);
- }
- 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);
}
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;
-#ifdef HAVE_TRACING
- int call_end = 0;
-#endif
+ simdata_process_t p_simdata = SIMIX_process_self_get_data(process);
CHECK_HOST();
#ifdef HAVE_TRACING
- call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST()
+ int 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();
+ t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data(process))->m_host;
- xbt_assert0(t_simdata->isused == 0,
+ xbt_assert(t_simdata->isused == 0,
"This task is still being used somewhere else. You cannot send it now. Go fix your code!");
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 {
- comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
- t_simdata->rate, task, sizeof(void *), NULL, NULL);
- t_simdata->comm = comm;
+ smx_action_t comm = SIMIX_req_comm_isend(mailbox, t_simdata->message_size,
+ t_simdata->rate, task, sizeof(void *),
+ NULL, NULL, 0);
#ifdef HAVE_TRACING
- SIMIX_req_set_category(comm, task->category);
+ if (TRACE_is_enabled()) {
+ SIMIX_req_set_category(comm, task->category);
+ }
#endif
- SIMIX_req_comm_wait(comm, timeout);
+ t_simdata->comm = comm;
+ SIMIX_req_comm_wait(comm, timeout);
}
CATCH(e) {
xbt_ex_free(e);
/* If the send failed, it is not used anymore */
- t_simdata->isused=0;
+ t_simdata->isused = 0;
}
- if (comm != NULL) {
- SIMIX_req_comm_destroy(comm);
- }
- process->simdata->waiting_task = NULL;
+ p_simdata->waiting_task = NULL;
#ifdef HAVE_TRACING
if (call_end)
TRACE_msg_task_put_end();