X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/19a9b26d01348385d94fe24c9e452c5ec427ae20..0916eaf25fc722ae0c9418f10dab481fe9af8b3d:/src/msg/msg_gos.c diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c index 5008fd6f92..cec273dd3b 100644 --- a/src/msg/msg_gos.c +++ b/src/msg/msg_gos.c @@ -27,7 +27,6 @@ MSG_error_t MSG_task_execute(m_task_t task) simdata_task_t simdata = NULL; simdata_process_t p_simdata; e_smx_state_t comp_state; - CHECK_HOST(); simdata = task->simdata; @@ -166,7 +165,6 @@ MSG_error_t MSG_parallel_task_execute(m_task_t task) simdata_task_t simdata = NULL; e_smx_state_t comp_state; simdata_process_t p_simdata; - CHECK_HOST(); simdata = task->simdata; p_simdata = SIMIX_process_self_get_data(SIMIX_process_self()); @@ -382,8 +380,6 @@ XBT_INLINE msg_comm_t MSG_task_isend_with_matching(m_task_t task, const char *al m_process_t process = MSG_process_self(); msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); - CHECK_HOST(); - /* FIXME: these functions are not traceable */ /* Prepare the task to send */ @@ -434,8 +430,6 @@ void MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup) m_process_t process = MSG_process_self(); msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); - CHECK_HOST(); - /* FIXME: these functions are not traceable */ /* Prepare the task to send */ @@ -470,8 +464,6 @@ msg_comm_t MSG_task_irecv(m_task_t *task, const char *name) { smx_rdv_t rdv = MSG_mailbox_get_by_alias(name); - CHECK_HOST(); - /* FIXME: these functions are not traceable */ /* Sanity check */ @@ -834,30 +826,29 @@ MSG_task_send_with_timeout(m_task_t task, const char *alias, } /** \ingroup msg_gos_functions - * \brief Look if there is a communication on a mailbox + * \brief Check if there is a communication going on in a mailbox. + * + * \param alias the name of the mailbox to be considered * - * \param alias the mailbox to listen - * \return return 1 if there is a communication or 0 + * \return Returns 1 if there is a communication, 0 otherwise */ int MSG_task_listen(const char *alias) { - CHECK_HOST(); - return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias)); } /** \ingroup msg_gos_functions - * \brief Look if there is a communication on a mailbox from - * a given host + * \brief Check the number of communication actions of a given host pending in a mailbox. * - * \param alias the mailbox to listen + * \param alias the name of the mailbox to be considered * \param host the host to check for communication - * \return return 1 if there is a communication or 0 + * + * \return Returns the number of pending communication actions of the host in the + * given mailbox, 0 if there is no pending communication actions. + * */ int MSG_task_listen_from_host(const char *alias, m_host_t host) { - CHECK_HOST(); - return MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias (alias), host); @@ -865,17 +856,17 @@ int MSG_task_listen_from_host(const char *alias, m_host_t host) /** \ingroup msg_gos_functions * \brief Look if there is a communication on a mailbox and return the - * PID from sender process + * PID of the sender process. + * + * \param alias the name of the mailbox to be considered * - * \param alias the mailbox to listen - * \return return the PID of process(or 0 in case of problem) + * \return Returns the PID of sender process, + * -1 if there is no communication in the mailbox. */ int MSG_task_listen_from(const char *alias) { m_task_t task; - CHECK_HOST(); - if (NULL == (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias)))) return -1; @@ -997,8 +988,6 @@ int MSG_task_probe_from(m_channel_t channel) XBT_WARN("DEPRECATED! Now use MSG_task_listen_from"); m_task_t task; - CHECK_HOST(); - xbt_assert((channel >= 0) && (channel < msg_global->max_channel), "Invalid channel %d", channel); @@ -1028,8 +1017,6 @@ int MSG_task_Iprobe(m_channel_t channel) && (channel < msg_global->max_channel), "Invalid channel %d", channel); - CHECK_HOST(); - return !MSG_mailbox_is_empty(MSG_mailbox_get_by_channel (MSG_host_self(), channel)); @@ -1055,8 +1042,6 @@ int MSG_task_probe_from_host(int channel, m_host_t host) && (channel < msg_global->max_channel), "Invalid channel %d", channel); - CHECK_HOST(); - return MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_channel (MSG_host_self(), channel),