X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7526c37879613289a86be06ec264b1cce5ef4049..d0d4cc7697e64b5092445d666a1e11712044d69d:/src/msg/msg_gos.c diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c index 38b579d283..7eb2d791e2 100644 --- a/src/msg/msg_gos.c +++ b/src/msg/msg_gos.c @@ -75,7 +75,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) XBT_DEBUG("Parallel execution action created: %p", simdata->compute); } else { simdata->compute = simcall_host_execute(task->name, - p_simdata->m_host->smx_host, + p_simdata->m_host, simdata->computation_amount, simdata->priority); @@ -186,6 +186,26 @@ MSG_task_receive_from_host(msg_task_t * task, const char *alias, return MSG_task_receive_ext(task, alias, -1, host); } +/** msg_task_usage + *\brief Deprecated function that used to receive a task from a mailbox from a specific host + *\brief at a given rate + * + * \param task a memory location for storing a #msg_task_t. + * \param alias name of the mailbox to receive the task from + * \param host a #msg_host_t host from where the task was sent + * \param rate limit the reception to rate bandwidth + * + * \return Returns + * #MSG_OK if the task was successfully received, + * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE otherwise. + */ +msg_error_t +MSG_task_receive_from_host_bounded(msg_task_t * task, const char *alias, + msg_host_t host, double rate) +{ + return MSG_task_receive_ext_bounded(task, alias, -1, host, rate); +} + /** \ingroup msg_task_usage * \brief Receives a task from a mailbox. * @@ -205,6 +225,22 @@ msg_error_t MSG_task_receive(msg_task_t * task, const char *alias) return MSG_task_receive_with_timeout(task, alias, -1); } +/** \ingroup msg_task_usage + * \brief Receives a task from a mailbox at a given rate. + * + * \param task a memory location for storing a #msg_task_t. + * \param alias name of the mailbox to receive the task from + * \param rate limit the reception to rate bandwidth + * + * \return Returns + * #MSG_OK if the task was successfully received, + * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE otherwise. + */ +msg_error_t MSG_task_receive_bounded(msg_task_t * task, const char *alias, double rate) +{ + return MSG_task_receive_with_timeout_bounded(task, alias, -1, rate); +} + /** \ingroup msg_task_usage * \brief Receives a task from a mailbox with a given timeout. * @@ -228,6 +264,25 @@ MSG_task_receive_with_timeout(msg_task_t * task, const char *alias, return MSG_task_receive_ext(task, alias, timeout, NULL); } +/** \ingroup msg_task_usage + * \brief Receives a task from a mailbox with a given timeout and at a given rate. + * + * \param task a memory location for storing a #msg_task_t. + * \param alias name of the mailbox to receive the task from + * \param timeout is the maximum wait time for completion (if -1, this call is the same as #MSG_task_receive) + * \param rate limit the reception to rate bandwidth + * + * \return Returns + * #MSG_OK if the task was successfully received, + * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE, or #MSG_TIMEOUT otherwise. + */ +msg_error_t +MSG_task_receive_with_timeout_bounded(msg_task_t * task, const char *alias, + double timeout,double rate) +{ + return MSG_task_receive_ext_bounded(task, alias, timeout, NULL,rate); +} + /** \ingroup msg_task_usage * \brief Receives a task from a mailbox from a specific host with a given timeout. * @@ -256,6 +311,31 @@ MSG_task_receive_ext(msg_task_t * task, const char *alias, double timeout, host, timeout); } +/** \ingroup msg_task_usage + * \brief Receives a task from a mailbox from a specific host with a given timeout + * and at a given rate. + * + * \param task a memory location for storing a #msg_task_t. + * \param alias name of the mailbox to receive the task from + * \param timeout is the maximum wait time for completion (provide -1 for no timeout) + * \param host a #msg_host_t host from where the task was sent + * \param rate limit the reception to rate bandwidth + * + * \return Returns + * #MSG_OK if the task was successfully received, +* #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE, or #MSG_TIMEOUT otherwise. + */ +msg_error_t +MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, double timeout, + msg_host_t host, double rate) +{ + XBT_DEBUG + ("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", + alias); + return MSG_mailbox_get_task_ext_bounded(MSG_mailbox_get_by_alias(alias), task, + host, timeout, rate); +} + /** \ingroup msg_task_usage * \brief Sends a task on a mailbox. * @@ -271,6 +351,25 @@ msg_comm_t MSG_task_isend(msg_task_t task, const char *alias) return MSG_task_isend_with_matching(task,alias,NULL,NULL); } +/** \ingroup msg_task_usage + * \brief Sends a task on a mailbox with a maximum rate + * + * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() + * to end the communication. The maxrate parameter allows the application + * to limit the bandwidth utilization of network links when sending the task. + * + * \param task a #msg_task_t to send on another location. + * \param alias name of the mailbox to sent the task to + * \param maxrate the maximum communication rate for sending this task . + * \return the msg_comm_t communication created + */ +msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate) +{ + task->simdata->rate = maxrate; + return MSG_task_isend_with_matching(task,alias,NULL,NULL); +} + + /** \ingroup msg_task_usage * \brief Sends a task on a mailbox, with support for matching requests * @@ -388,6 +487,66 @@ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) #endif } + +/** \ingroup msg_task_usage + * \brief Sends a task on a mailbox with a maximal rate. + * + * This is a non blocking detached send function. + * Think of it as a best effort send. Keep in mind that the third parameter + * is only called if the communication fails. If the communication does work, + * it is responsibility of the receiver code to free anything related to + * the task, as usual. More details on this can be obtained on + * this thread + * in the SimGrid-user mailing list archive. + * + * \param task a #msg_task_t to send on another location. + * \param alias name of the mailbox to sent the task to + * \param cleanup a function to destroy the task if the + * communication fails, e.g. MSG_task_destroy + * (if NULL, no function will be called) + * \param maxrate the maximum communication rate for sending this task + * + */ +void MSG_task_dsend_bounded(msg_task_t task, const char *alias, void_f_pvoid_t cleanup, double maxrate) +{ + task->simdata->rate = maxrate; + + simdata_task_t t_simdata = NULL; + msg_process_t process = MSG_process_self(); + msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); + + /* Prepare the task to send */ + t_simdata = task->simdata; + t_simdata->sender = process; + t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data(process))->m_host; + + 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; + t_simdata->comm = NULL; + msg_global->sent_msg++; + +#ifdef HAVE_TRACING + int call_end = TRACE_msg_task_put_start(task); +#endif + + /* Send it by calling SIMIX network layer */ + smx_action_t comm = simcall_comm_isend(mailbox, t_simdata->message_size, + t_simdata->rate, task, sizeof(void *), NULL, cleanup, NULL, 1); + t_simdata->comm = comm; +#ifdef HAVE_TRACING + if (TRACE_is_enabled()) { + simcall_set_category(comm, task->category); + } +#endif + +#ifdef HAVE_TRACING + if (call_end) + TRACE_msg_task_put_end(); +#endif +} + /** \ingroup msg_task_usage * \brief Starts listening for receiving a task from an asynchronous communication. * @@ -421,6 +580,40 @@ msg_comm_t MSG_task_irecv(msg_task_t *task, const char *name) return comm; } +/** \ingroup msg_task_usage + * \brief Starts listening for receiving a task from an asynchronous communication + * at a given rate. + * + * \param task a memory location for storing a #msg_task_t. has to be valid until the end of the communication. + * \param name of the mailbox to receive the task on + * \param rate limit the bandwidth to the given rate + * \return the msg_comm_t communication created + */ +msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rate) +{ + + + smx_rdv_t rdv = MSG_mailbox_get_by_alias(name); + simcall_comm_change_rate_first_action(rdv,rate); + /* FIXME: these functions are not traceable */ + + /* Sanity check */ + xbt_assert(task, "Null pointer for the task storage"); + + if (*task) + XBT_CRITICAL + ("MSG_task_irecv() was asked to write in a non empty task struct."); + + /* Try to receive it by calling SIMIX network layer */ + msg_comm_t comm = xbt_new0(s_msg_comm_t, 1); + comm->task_sent = NULL; + comm->task_received = task; + comm->status = MSG_OK; + comm->s_comm = simcall_comm_irecv(rdv, task, NULL, NULL, NULL); + + return comm; +} + /** \ingroup msg_task_usage * \brief Checks whether a communication is done, and if yes, finalizes it. * \param comm the communication to test @@ -744,6 +937,29 @@ MSG_task_send_with_timeout(msg_task_t task, const char *alias, task, timeout); } +/** \ingroup msg_task_usage + * \brief Sends a task to a mailbox with a timeout and with a maximum rate + * + * This is a blocking function, the execution flow will be blocked + * until the task is sent or the timeout is achieved. + * + * \param task the task to be sent + * \param alias the mailbox name to where the task is sent + * \param timeout is the maximum wait time for completion (if -1, this call is the same as #MSG_task_send) + * \param maxrate the maximum communication rate for sending this task + * + * \return Returns #MSG_OK if the task was successfully sent, + * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE, or #MSG_TIMEOUT otherwise. + */ +msg_error_t +MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alias, + double timeout, double maxrate) +{ + task->simdata->rate = maxrate; + return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_alias(alias), + task, timeout); +} + /** \ingroup msg_task_usage * \brief Check if there is a communication going on in a mailbox. *