X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/15142e98775405b23e3059da088d4aeecb906b78..e5922b4dce28002422ca9d68a4c44521f67c0f6f:/src/msg/gos.c diff --git a/src/msg/gos.c b/src/msg/gos.c index db0ffdaa31..4a09c655dd 100644 --- a/src/msg/gos.c +++ b/src/msg/gos.c @@ -43,14 +43,14 @@ MSG_error_t MSG_task_execute(m_task_t task) 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); @@ -173,11 +173,11 @@ MSG_error_t MSG_parallel_task_execute(m_task_t task) 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); @@ -331,7 +331,7 @@ MSG_error_t 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); @@ -382,6 +382,24 @@ MSG_task_receive_ext(m_task_t * task, const char *alias, double timeout, * \return the msg_comm_t communication created */ msg_comm_t MSG_task_isend(m_task_t task, const char *alias) +{ + return MSG_task_isend_with_matching(task,alias,NULL,NULL); +} +/** \ingroup msg_gos_functions + * \brief Sends a task on a mailbox, with support for matching requests + * + * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() + * to end the communication. + * + * \param task a #m_task_t to send on another location. + * \param alias name of the mailbox to sent the task to + * \param match_fun boolean function taking the #match_data provided by sender (here), and the one of the receiver (if any) and returning whether they match + * \param match_data user provided data passed to match_fun + * \return the msg_comm_t communication created + */ +XBT_INLINE msg_comm_t MSG_task_isend_with_matching(m_task_t task, const char *alias, + int (*match_fun)(void*,void*), + void *match_data) { simdata_task_t t_simdata = NULL; m_process_t process = MSG_process_self(); @@ -396,7 +414,7 @@ msg_comm_t MSG_task_isend(m_task_t task, const char *alias) 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; @@ -409,7 +427,7 @@ msg_comm_t MSG_task_isend(m_task_t task, const char *alias) comm->status = MSG_OK; comm->s_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 *), match_fun, match_data, 0); t_simdata->comm = comm->s_comm; /* FIXME: is the field t_simdata->comm still useful? */ return comm; @@ -447,7 +465,7 @@ void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup) 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; @@ -468,16 +486,16 @@ void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup) * \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 @@ -713,7 +731,7 @@ int MSG_comm_waitany(xbt_dynar_t comms) 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); @@ -737,7 +755,7 @@ MSG_error_t MSG_comm_get_status(msg_comm_t comm) { 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; } @@ -820,7 +838,7 @@ MSG_error_t 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); @@ -871,7 +889,7 @@ int MSG_task_listen(const char *alias) */ 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); @@ -897,7 +915,7 @@ int MSG_task_Iprobe(m_channel_t 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); @@ -934,7 +952,7 @@ int MSG_task_probe_from(m_channel_t channel) CHECK_HOST(); - xbt_assert1((channel >= 0) + xbt_assert((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d", channel);