simdata = task->simdata;
- xbt_assert0(simdata->host_nb == 0,
+ xbt_assert(simdata->host_nb == 0,
"This is a parallel task. Go to hell.");
#ifdef HAVE_TRACING
TRACE_msg_task_execute_start(task);
#endif
- xbt_assert1((!simdata->compute) && (task->simdata->isused == 0),
+ xbt_assert((!simdata->compute) && (task->simdata->isused == 0),
"This task is executed somewhere else. Go fix your code! %d",
task->simdata->isused);
simdata = task->simdata;
p_simdata = SIMIX_process_self_get_data();
- xbt_assert0((!simdata->compute)
+ xbt_assert((!simdata->compute)
&& (task->simdata->isused == 0),
"This task is executed somewhere else. Go fix your code!");
- xbt_assert0(simdata->host_nb,
+ xbt_assert(simdata->host_nb,
"This is not a parallel task. Go to hell.");
XBT_DEBUG("Parallel computing on %s", p_simdata->m_host->name);
MSG_task_get_ext(m_task_t * task, m_channel_t channel, double timeout,
m_host_t host)
{
- xbt_assert1((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
t_simdata->sender = process;
t_simdata->source = MSG_host_self();
- 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;
* \brief Sends a task on a mailbox.
*
* This is a non blocking detached send function.
- * Think of it as a best effort send. The communication
- * object will be destroyed by the receiver (if any).
+ * Think of it as a best effort send. The task should
+ * be destroyed by the receiver.
*
* \param task a #m_task_t to send on another location.
* \param alias name of the mailbox to sent the task to
t_simdata->sender = process;
t_simdata->source = MSG_host_self();
- 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;
* \param name of the mailbox to receive the task on
* \return the msg_comm_t communication created
*/
-msg_comm_t MSG_task_irecv(m_task_t *task, const char *alias)
+msg_comm_t MSG_task_irecv(m_task_t *task, const char *name)
{
- smx_rdv_t rdv = MSG_mailbox_get_by_alias(alias);
+ smx_rdv_t rdv = MSG_mailbox_get_by_alias(name);
CHECK_HOST();
/* FIXME: these functions are not tracable */
/* Sanity check */
- xbt_assert0(task, "Null pointer for the task storage");
+ xbt_assert(task, "Null pointer for the task storage");
if (*task)
XBT_CRITICAL
(*comm->task_received)->simdata->isused = 0;
}
- /* FIXME auto-destroy comms from SIMIX to avoid this request */
- /*SIMIX_req_comm_destroy(comm->s_comm);*/
- free(comm);
+ xbt_free(comm);
}
/** \ingroup msg_gos_functions
xbt_ex_free(e);
}
- xbt_assert0(finished_index != -1, "WaitAny returned -1");
+ xbt_assert(finished_index != -1, "WaitAny returned -1");
xbt_dynar_free(&s_comms);
comm = xbt_dynar_get_as(comms, finished_index, msg_comm_t);
m_task_t MSG_comm_get_task(msg_comm_t comm)
{
- xbt_assert0(comm, "Invalid parameter");
+ xbt_assert(comm, "Invalid parameter");
return comm->task_received ? *comm->task_received : comm->task_sent;
}
MSG_task_put_with_timeout(m_task_t task, m_host_t dest,
m_channel_t channel, double timeout)
{
- xbt_assert1((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
*/
int MSG_task_Iprobe(m_channel_t channel)
{
- xbt_assert1((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
*/
int MSG_task_probe_from_host(int channel, m_host_t host)
{
- xbt_assert1((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);
CHECK_HOST();
- xbt_assert1((channel >= 0)
+ xbt_assert((channel >= 0)
&& (channel < msg_global->max_channel), "Invalid channel %d",
channel);