X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26a8af5df5398c71bffa5ef6e7675c2d28844dce..20f2291e7c83e26eebe9aeb61a91b76b5aed5a64:/src/msg/msg_gos.c diff --git a/src/msg/msg_gos.c b/src/msg/msg_gos.c index fbb2bcfe2f..d5ba36ef22 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); @@ -164,7 +164,7 @@ msg_error_t MSG_process_sleep(double nb_sec) * sometime waiting on all these mailboxes using @ref MSG_comm_waitany. You can find * an example of use of this function in the @ref MSG_examples section. * - Provide a proper patch to implement this functionality back in MSG. That wouldn't be - * very difficult actually. Check the function #MSG_mailbox_get_task_ext. During its call to + * very difficult actually. Check the function @ref MSG_mailbox_get_task_ext. During its call to * simcall_comm_recv(), the 5th argument, match_fun, is NULL. Create a function that filters * messages according to the host (that you will pass as sixth argument to simcall_comm_recv() * and that your filtering function will receive as first parameter, and then, the filter could @@ -271,6 +271,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 * @@ -294,7 +313,9 @@ XBT_INLINE msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char * msg_process_t process = MSG_process_self(); msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); - /* FIXME: these functions are not traceable */ +#ifdef HAVE_TRACING + int call_end = TRACE_msg_task_put_start(task); +#endif /* Prepare the task to send */ t_simdata = task->simdata; @@ -317,6 +338,16 @@ XBT_INLINE msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char * simcall_comm_isend(mailbox, t_simdata->message_size, t_simdata->rate, task, sizeof(void *), match_fun, NULL, match_data, 0); t_simdata->comm = comm->s_comm; /* FIXME: is the field t_simdata->comm still useful? */ +#ifdef HAVE_TRACING + if (TRACE_is_enabled()) { + simcall_set_category(comm->s_comm, task->category); + } +#endif + +#ifdef HAVE_TRACING + if (call_end) + TRACE_msg_task_put_end(); +#endif return comm; } @@ -344,7 +375,65 @@ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) msg_process_t process = MSG_process_self(); msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); - /* FIXME: these functions are not traceable */ + /* 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 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; @@ -358,10 +447,24 @@ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) 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 @@ -409,6 +512,7 @@ int MSG_comm_test(msg_comm_t comm) { xbt_ex_t e; int finished = 0; + TRY { finished = simcall_comm_test(comm->s_comm); @@ -719,6 +823,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. * @@ -813,6 +940,42 @@ const char *MSG_task_get_category (msg_task_t task) #endif } +/** + * \brief Returns the value of a given AS or router property + * + * \param asr the name of a router or AS + * \param name a property name + * \return value of a property (or NULL if property not set) + */ +const char *MSG_as_router_get_property_value(const char* asr, const char *name) +{ + return xbt_dict_get_or_null(MSG_as_router_get_properties(asr), name); +} + +/** + * \brief Returns a xbt_dict_t consisting of the list of properties assigned to + * a the AS or router + * + * \param asr the name of a router or AS + * \return a dict containing the properties + */ +xbt_dict_t MSG_as_router_get_properties(const char* asr) +{ + return (simcall_asr_get_properties(asr)); +} + +/** + * \brief Change the value of a given AS or router + * + * \param asr the name of a router or AS + * \param name a property name + * \param value what to change the property to + * \param free_ctn the freeing function to use to kill the value on need + */ +void MSG_as_router_set_property_value(const char* asr, const char *name, char *value,void_f_pvoid_t free_ctn) { + xbt_dict_set(MSG_as_router_get_properties(asr), name, value,free_ctn); +} + #ifdef MSG_USE_DEPRECATED /** \ingroup msg_deprecated_functions *