X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8fbe869be3d58fb9d6fea1adfa2e8a2462231870..a15797ea55151ddfdbae48147e74159efe01b411:/src/msg/msg_gos.cpp diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index d6e0a6bddb..becc04b412 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -1,11 +1,10 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2016. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include "src/simix/smx_private.h" /* MSG_task_listen looks inside the rdv directly. Not clean. */ #include "msg_private.h" -#include "msg_mailbox.h" #include "mc/mc.h" #include "xbt/log.h" #include "xbt/sysdep.h" @@ -16,11 +15,9 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, /** \ingroup msg_task_usage * \brief Executes a task and waits for its termination. * - * This function is used for describing the behavior of a process. It - * takes only one parameter. + * This function is used for describing the behavior of a process. It takes only one parameter. * \param task a #msg_task_t to execute on the location on which the process is running. - * \return #MSG_OK if the task was successfully completed, #MSG_TASK_CANCELED - * or #MSG_HOST_FAILURE otherwise + * \return #MSG_OK if the task was successfully completed, #MSG_TASK_CANCELED or #MSG_HOST_FAILURE otherwise */ msg_error_t MSG_task_execute(msg_task_t task) { @@ -47,16 +44,14 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) { xbt_ex_t e; simdata_task_t simdata = task->simdata; - msg_process_t self = SIMIX_process_self(); - simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(self); + simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(); e_smx_state_t comp_state; msg_error_t status = MSG_OK; TRACE_msg_task_execute_start(task); xbt_assert((!simdata->compute) && (task->simdata->isused == 0), - "This task is executed somewhere else. Go fix your code! %d", - task->simdata->isused!=NULL); + "This task is executed somewhere else. Go fix your code! %d", task->simdata->isused!=NULL); XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self())); @@ -65,7 +60,6 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) return MSG_OK; } - TRY { if (msg_global->debug_multiple_use) MSG_BT(simdata->isused, "Using Backtrace"); @@ -73,24 +67,21 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) simdata->isused = (void*)1; if (simdata->host_nb > 0) { - simdata->compute = simcall_execution_parallel_start(task->name, - simdata->host_nb, - simdata->host_list, - simdata->flops_parallel_amount, - simdata->bytes_parallel_amount, - 1.0, -1.0); + simdata->compute = static_cast( + simcall_execution_parallel_start(task->name, simdata->host_nb,simdata->host_list, + simdata->flops_parallel_amount, simdata->bytes_parallel_amount, + 1.0, -1.0)); XBT_DEBUG("Parallel execution action created: %p", simdata->compute); } else { - unsigned long affinity_mask = (unsigned long)(uintptr_t) xbt_dict_get_or_null_ext(simdata->affinity_mask_db, (char *) p_simdata->m_host, sizeof(msg_host_t)); - XBT_DEBUG("execute %s@%s with affinity(0x%04lx)", MSG_task_get_name(task), MSG_host_get_name(p_simdata->m_host), affinity_mask); - - simdata->compute = simcall_execution_start(task->name, - simdata->flops_amount, - simdata->priority, - simdata->bound, - affinity_mask - ); - + unsigned long affinity_mask = + (unsigned long)(uintptr_t) xbt_dict_get_or_null_ext(simdata->affinity_mask_db, (char *) p_simdata->m_host, + sizeof(msg_host_t)); + XBT_DEBUG("execute %s@%s with affinity(0x%04lx)", + MSG_task_get_name(task), MSG_host_get_name(p_simdata->m_host), affinity_mask); + + simdata->compute = static_cast( + simcall_execution_start(task->name, simdata->flops_amount, simdata->priority, + simdata->bound, affinity_mask)); } simcall_set_category(simdata->compute, task->category); p_simdata->waiting_action = simdata->compute; @@ -102,8 +93,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) xbt_ex_free(*(xbt_ex_t*)simdata->isused); simdata->isused = 0; - XBT_DEBUG("Execution task '%s' finished in state %d", - task->name, (int)comp_state); + XBT_DEBUG("Execution task '%s' finished in state %d", task->name, (int)comp_state); } CATCH(e) { switch (e.category) { @@ -118,8 +108,7 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) } xbt_ex_free(e); } - /* action ended, set comm and compute = NULL, the actions is already destroyed - * in the main function */ + /* action ended, set comm and compute = NULL, the actions is already destroyed in the main function */ simdata->flops_amount = 0.0; simdata->comm = NULL; simdata->compute = NULL; @@ -128,7 +117,6 @@ msg_error_t MSG_parallel_task_execute(msg_task_t task) MSG_RETURN(status); } - /** \ingroup msg_task_usage * \brief Sleep for the specified number of seconds * @@ -169,69 +157,10 @@ msg_error_t MSG_process_sleep(double nb_sec) MSG_RETURN(status); } -/** \ingroup msg_task_usage - * \brief Deprecated function that used to receive a task from a mailbox from a specific host. - * - * Sorry, this function is not supported anymore. That wouldn't be - * impossible to reimplement it, but we are lacking the time to do so ourselves. - * If you need this functionality, you can either: - * - * - implement the buffering mechanism on the user-level by queuing all messages - * received in the mailbox that do not match your expectation - * - change your application logic to leverage the mailboxes features. For example, - * if you have A receiving messages from B and C, you could have A waiting on - * mailbox "A" most of the time, but on "A#B" when it's waiting for specific - * messages from B and "A#C" when waiting for messages from C. You could even get A - * 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 @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 - * simply compare the host names, for example. After sufficient testing, provide an example that - * we could add to the distribution, and your first contribution to SimGrid is ready. Thanks in advance. - * - * \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 - * - * \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(msg_task_t * task, const char *alias, - msg_host_t host) -{ - 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. * - * This is a blocking function, the execution flow will be blocked - * until the task is received. See #MSG_task_irecv + * This is a blocking function, the execution flow will be blocked until the task is received. See #MSG_task_irecv * for receiving tasks asynchronously. * * \param task a memory location for storing a #msg_task_t. @@ -251,14 +180,13 @@ msg_error_t MSG_task_receive(msg_task_t * task, const char *alias) * * \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 + * \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) +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); } @@ -266,9 +194,8 @@ msg_error_t MSG_task_receive_bounded(msg_task_t * task, const char *alias, /** \ingroup msg_task_usage * \brief Receives a task from a mailbox with a given timeout. * - * This is a blocking function with a timeout, the execution flow will be blocked - * until the task is received or the timeout is achieved. See #MSG_task_irecv - * for receiving tasks asynchronously. You can provide a -1 timeout + * This is a blocking function with a timeout, the execution flow will be blocked until the task is received or the + * timeout is achieved. See #MSG_task_irecv for receiving tasks asynchronously. You can provide a -1 timeout * to obtain an infinite timeout. * * \param task a memory location for storing a #msg_task_t. @@ -279,9 +206,7 @@ msg_error_t MSG_task_receive_bounded(msg_task_t * task, const char *alias, * #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(msg_task_t * task, const char *alias, - double timeout) +msg_error_t MSG_task_receive_with_timeout(msg_task_t * task, const char *alias, double timeout) { return MSG_task_receive_ext(task, alias, timeout, NULL); } @@ -298,9 +223,7 @@ MSG_task_receive_with_timeout(msg_task_t * task, const char *alias, * #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) +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); } @@ -308,9 +231,8 @@ MSG_task_receive_with_timeout_bounded(msg_task_t * task, const char *alias, /** \ingroup msg_task_usage * \brief Receives a task from a mailbox from a specific host with a given timeout. * - * This is a blocking function with a timeout, the execution flow will be blocked - * until the task is received or the timeout is achieved. See #MSG_task_irecv - * for receiving tasks asynchronously. You can provide a -1 timeout + * This is a blocking function with a timeout, the execution flow will be blocked until the task is received or the + * timeout is achieved. See #MSG_task_irecv for receiving tasks asynchronously. You can provide a -1 timeout * to obtain an infinite timeout. * * \param task a memory location for storing a #msg_task_t. @@ -322,18 +244,13 @@ MSG_task_receive_with_timeout_bounded(msg_task_t * task, const char *alias, * #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(msg_task_t * task, const char *alias, double timeout, - msg_host_t host) +msg_error_t MSG_task_receive_ext(msg_task_t * task, const char *alias, double timeout, msg_host_t host) { xbt_ex_t e; msg_error_t ret = MSG_OK; - XBT_DEBUG - ("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", - alias); + XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias); TRY { - ret = MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task, - host, timeout); + ret = MSG_mailbox_get_task_ext(MSG_mailbox_get_by_alias(alias), task, host, timeout); } CATCH(e) { switch (e.category) { @@ -349,8 +266,7 @@ MSG_task_receive_ext(msg_task_t * task, const char *alias, double 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. + * \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 @@ -362,25 +278,17 @@ MSG_task_receive_ext(msg_task_t * task, const char *alias, double timeout, * #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) +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); + 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); } -/* Internal function used to factorize code between - * MSG_task_isend_with_matching() and MSG_task_dsend(). - */ -static XBT_INLINE -msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *alias, - int (*match_fun)(void*,void*, smx_synchro_t), - void *match_data, void_f_pvoid_t cleanup, - int detached) +/* Internal function used to factorize code between MSG_task_isend_with_matching() and MSG_task_dsend(). */ +static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *alias, + int (*match_fun)(void*,void*, smx_synchro_t), + void *match_data, void_f_pvoid_t cleanup, int detached) { simdata_task_t t_simdata = NULL; msg_process_t process = MSG_process_self(); @@ -390,7 +298,7 @@ msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *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; + t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data())->m_host; if (t_simdata->isused != 0) { if (msg_global->debug_multiple_use){ @@ -400,7 +308,8 @@ msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *alias, xbt_backtrace_display_current(); } else { xbt_assert(t_simdata->isused == 0, - "This task is still being used somewhere else. You cannot send it now. Go fix your code! (use --cfg=msg/debug_multiple_use:on to get the backtrace of the other process)"); + "This task is still being used somewhere else. You cannot send it now. Go fix your code!" + "(use --cfg=msg/debug-multiple-use:on to get the backtrace of the other process)"); } } @@ -412,10 +321,9 @@ msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *alias, msg_global->sent_msg++; /* Send it by calling SIMIX network layer */ - smx_synchro_t act = simcall_comm_isend(SIMIX_process_self(), mailbox, t_simdata->bytes_amount, - t_simdata->rate, task, sizeof(void *), - match_fun, cleanup, NULL, match_data,detached); - t_simdata->comm = act; /* FIXME: is the field t_simdata->comm still useful? */ + smx_synchro_t act = simcall_comm_isend(SIMIX_process_self(), mailbox, t_simdata->bytes_amount, t_simdata->rate, + task, sizeof(void *), match_fun, cleanup, NULL, match_data,detached); + t_simdata->comm = static_cast(act); /* FIXME: is the field t_simdata->comm still useful? */ msg_comm_t comm; if (detached) { @@ -436,12 +344,10 @@ msg_comm_t MSG_task_isend_internal(msg_task_t task, const char *alias, return comm; } - /** \ingroup msg_task_usage * \brief Sends a task on a mailbox. * - * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() - * to end the communication. + * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() to end the communication. * * \param task a #msg_task_t to send on another location. * \param alias name of the mailbox to sent the task to @@ -455,28 +361,24 @@ msg_comm_t MSG_task_isend(msg_task_t task, const char *alias) /** \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. + * 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) +msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double maxrate) { task->simdata->rate = maxrate; return MSG_task_isend_internal(task, alias, NULL, NULL, NULL, 0); } - /** \ingroup msg_task_usage * \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. + * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() to end the communication. * * \param task a #msg_task_t to send on another location. * \param alias name of the mailbox to sent the task to @@ -488,9 +390,7 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, * \return the msg_comm_t communication created */ msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char *alias, - int (*match_fun)(void*, void*, - smx_synchro_t), - void *match_data) + int (*match_fun)(void*, void*, smx_synchro_t), void *match_data) { return MSG_task_isend_internal(task, alias, match_fun, match_data, NULL, 0); } @@ -499,17 +399,15 @@ msg_comm_t MSG_task_isend_with_matching(msg_task_t task, const char *alias, * \brief Sends a task on a mailbox. * * 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 + * 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 + * \param cleanup a function to destroy the task if the communication fails, e.g. MSG_task_destroy * (if NULL, no function will be called) */ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) @@ -521,10 +419,9 @@ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) * \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 + * 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. * @@ -536,8 +433,7 @@ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) * \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) +void MSG_task_dsend_bounded(msg_task_t task, const char *alias, void_f_pvoid_t cleanup, double maxrate) { task->simdata->rate = maxrate; MSG_task_dsend(task, alias, cleanup); @@ -546,8 +442,7 @@ void MSG_task_dsend_bounded(msg_task_t task, const char *alias, /** \ingroup msg_task_usage * \brief Starts listening for receiving a task from an asynchronous communication. * - * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() - * to end the communication. + * This is a non blocking function: use MSG_comm_wait() or MSG_comm_test() to end the communication. * * \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 @@ -559,27 +454,23 @@ msg_comm_t MSG_task_irecv(msg_task_t *task, const char *name) } /** \ingroup msg_task_usage - * \brief Starts listening for receiving a task from an asynchronous communication - * at a given rate. + * \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) +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); + smx_mailbox_t rdv = MSG_mailbox_get_by_alias(name); /* 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."); + 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); @@ -620,12 +511,10 @@ int MSG_comm_test(msg_comm_t comm) comm->status = MSG_TRANSFER_FAILURE; finished = 1; break; - case timeout_error: comm->status = MSG_TIMEOUT; finished = 1; break; - default: RETHROW; } @@ -665,12 +554,10 @@ int MSG_comm_testany(xbt_dynar_t comms) finished_index = e.value; status = MSG_TRANSFER_FAILURE; break; - case timeout_error: finished_index = e.value; status = MSG_TIMEOUT; break; - default: RETHROW; } @@ -708,8 +595,8 @@ void MSG_comm_destroy(msg_comm_t comm) * * It takes two parameters. * \param comm the communication to wait. - * \param timeout Wait until the communication terminates or the timeout - * occurs. You can provide a -1 timeout to obtain an infinite timeout. + * \param timeout Wait until the communication terminates or the timeout occurs. + * You can provide a -1 timeout to obtain an infinite timeout. * \return msg_error_t */ msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout) @@ -788,12 +675,10 @@ int MSG_comm_waitany(xbt_dynar_t comms) finished_index = e.value; status = MSG_TRANSFER_FAILURE; break; - case timeout_error: finished_index = e.value; status = MSG_TIMEOUT; break; - default: RETHROW; } @@ -819,9 +704,9 @@ int MSG_comm_waitany(xbt_dynar_t comms) /** * \ingroup msg_task_usage - * \brief Returns the error (if any) that occured during a finished communication. + * \brief Returns the error (if any) that occurred during a finished communication. * \param comm a finished communication - * \return the status of the communication, or #MSG_OK if no error occured + * \return the status of the communication, or #MSG_OK if no error occurred * during the communication */ msg_error_t MSG_comm_get_status(msg_comm_t comm) { @@ -848,24 +733,24 @@ msg_task_t MSG_comm_get_task(msg_comm_t comm) * \param buff the data copied * \param buff_size size of the buffer */ -void MSG_comm_copy_data_from_SIMIX(smx_synchro_t comm, void* buff, size_t buff_size) { +void MSG_comm_copy_data_from_SIMIX(smx_synchro_t synchro, void* buff, size_t buff_size) +{ + simgrid::simix::Comm *comm = static_cast(synchro); - // copy the task SIMIX_comm_copy_pointer_callback(comm, buff, buff_size); // notify the user callback if any if (msg_global->task_copy_callback) { msg_task_t task = (msg_task_t) buff; - msg_global->task_copy_callback(task, - simcall_comm_get_src_proc(comm), simcall_comm_get_dst_proc(comm)); + msg_global->task_copy_callback(task, comm->src_proc, comm->dst_proc); } } /** \ingroup msg_task_usage * \brief Sends a task to a mailbox * - * This is a blocking function, the execution flow will be blocked - * until the task is sent (and received in the other side if #MSG_task_receive is used). + * This is a blocking function, the execution flow will be blocked until the task is sent (and received on the other + * side if #MSG_task_receive is used). * See #MSG_task_isend for sending tasks asynchronously. * * \param task the task to be sent @@ -883,9 +768,8 @@ msg_error_t MSG_task_send(msg_task_t task, const char *alias) /** \ingroup msg_task_usage * \brief Sends a task to a mailbox with a maximum rate * - * This is a blocking function, the execution flow will be blocked - * until the task is sent. The maxrate parameter allows the application - * to limit the bandwidth utilization of network links when sending the task. + * This is a blocking function, the execution flow will be blocked until the task is sent. The maxrate parameter allows + * the application to limit the bandwidth utilization of network links when sending the task. * * \param task the task to be sent * \param alias the mailbox name to where the task is sent @@ -894,8 +778,7 @@ msg_error_t MSG_task_send(msg_task_t task, const char *alias) * \return Returns #MSG_OK if the task was successfully sent, * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE otherwise. */ -msg_error_t -MSG_task_send_bounded(msg_task_t task, const char *alias, double maxrate) +msg_error_t MSG_task_send_bounded(msg_task_t task, const char *alias, double maxrate) { task->simdata->rate = maxrate; return MSG_task_send(task, alias); @@ -904,8 +787,7 @@ MSG_task_send_bounded(msg_task_t task, const char *alias, double maxrate) /** \ingroup msg_task_usage * \brief Sends a task to a mailbox with a timeout * - * This is a blocking function, the execution flow will be blocked - * until the task is sent or the timeout is achieved. + * 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 @@ -914,19 +796,87 @@ MSG_task_send_bounded(msg_task_t task, const char *alias, double maxrate) * \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(msg_task_t task, const char *alias, - double timeout) +msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, double timeout) { - return MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_alias(alias), - task, timeout); + msg_error_t ret = MSG_OK; + simdata_task_t t_simdata = NULL; + msg_process_t process = MSG_process_self(); + simdata_process_t p_simdata = (simdata_process_t) SIMIX_process_self_get_data(); + msg_mailbox_t mailbox = MSG_mailbox_get_by_alias(alias); + + int call_end = TRACE_msg_task_put_start(task); //must be after CHECK_HOST() + + /* Prepare the task to send */ + t_simdata = task->simdata; + t_simdata->sender = process; + t_simdata->source = ((simdata_process_t) SIMIX_process_self_get_data())->m_host; + + if (t_simdata->isused != 0) { + if (msg_global->debug_multiple_use){ + XBT_ERROR("This task is already used in there:"); + xbt_backtrace_display((xbt_ex_t*) t_simdata->isused); + XBT_ERROR("And you try to reuse it from here:"); + xbt_backtrace_display_current(); + } else { + xbt_assert(t_simdata->isused == 0, + "This task is still being used somewhere else. You cannot send it now. Go fix your code!" + " (use --cfg=msg/debug-multiple-use:on to get the backtrace of the other process)"); + } + } + + if (msg_global->debug_multiple_use) + MSG_BT(t_simdata->isused, "Using Backtrace"); + else + t_simdata->isused = (void*)1; + t_simdata->comm = NULL; + msg_global->sent_msg++; + + p_simdata->waiting_task = task; + + xbt_ex_t e; + /* Try to send it by calling SIMIX network layer */ + TRY { + smx_synchro_t comm = NULL; /* MC needs the comm to be set to NULL during the simix call */ + comm = simcall_comm_isend(SIMIX_process_self(), mailbox,t_simdata->bytes_amount, + t_simdata->rate, task, sizeof(void *), NULL, NULL, NULL, task, 0); + if (TRACE_is_enabled()) + simcall_set_category(comm, task->category); + t_simdata->comm = static_cast(comm); + simcall_comm_wait(comm, timeout); + } + + CATCH(e) { + switch (e.category) { + case cancel_error: + ret = MSG_HOST_FAILURE; + break; + case network_error: + ret = MSG_TRANSFER_FAILURE; + break; + case timeout_error: + ret = MSG_TIMEOUT; + break; + default: + RETHROW; + } + xbt_ex_free(e); + + /* If the send failed, it is not used anymore */ + if (msg_global->debug_multiple_use && t_simdata->isused!=0) + xbt_ex_free(*(xbt_ex_t*)t_simdata->isused); + t_simdata->isused = 0; + } + + p_simdata->waiting_task = NULL; + if (call_end) + TRACE_msg_task_put_end(); + MSG_RETURN(ret); } /** \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. + * 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 @@ -936,13 +886,10 @@ MSG_task_send_with_timeout(msg_task_t task, const char *alias, * \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) +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); + return MSG_task_send_with_timeout(task, alias, timeout); } /** \ingroup msg_task_usage @@ -954,29 +901,12 @@ MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alias, */ int MSG_task_listen(const char *alias) { - return !MSG_mailbox_is_empty(MSG_mailbox_get_by_alias(alias)); + smx_mailbox_t mbox = MSG_mailbox_get_by_alias(alias); + return !MSG_mailbox_is_empty(mbox) || (mbox->permanent_receiver && !mbox->done_comm_queue->empty()); } /** \ingroup msg_task_usage - * \brief Check the number of communication actions of a given host pending in a mailbox. - * - * \param alias the name of the mailbox to be considered - * \param host the host to check for communication - * - * \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, msg_host_t host) -{ - return - MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_alias - (alias), host); -} - -/** \ingroup msg_task_usage - * \brief Look if there is a communication on a mailbox and return the - * PID of the sender process. + * \brief Look if there is a communication on a mailbox and return the PID of the sender process. * * \param alias the name of the mailbox to be considered * @@ -987,8 +917,7 @@ int MSG_task_listen_from(const char *alias) { msg_task_t task; - if (NULL == - (task = MSG_mailbox_get_head(MSG_mailbox_get_by_alias(alias)))) + if (NULL == (task = MSG_mailbox_front(MSG_mailbox_get_by_alias(alias)))) return -1; return MSG_process_get_PID(task->simdata->sender); @@ -997,16 +926,12 @@ int MSG_task_listen_from(const char *alias) /** \ingroup msg_task_usage * \brief Sets the tracing category of a task. * - * This function should be called after the creation of - * a MSG task, to define the category of that task. The - * first parameter task must contain a task that was - * created with the function #MSG_task_create. The second - * parameter category must contain a category that was - * previously declared with the function #TRACE_category + * This function should be called after the creation of a MSG task, to define the category of that task. The + * first parameter task must contain a task that was created with the function #MSG_task_create. The second + * parameter category must contain a category that was previously declared with the function #TRACE_category * (or with #TRACE_category_with_color). * - * See \ref tracing for details on how to trace - * the (categorized) resource utilization. + * See \ref outcomes_vizu for details on how to trace the (categorized) resource utilization. * * \param task the task that is going to be categorized * \param category the name of the category to be associated to the task @@ -1042,8 +967,7 @@ const char *MSG_task_get_category (msg_task_t task) */ const char *MSG_as_router_get_property_value(const char* asr, const char *name) { - return (char*) xbt_dict_get_or_null( - MSG_as_router_get_properties(asr), name); + return (char*) xbt_dict_get_or_null(MSG_as_router_get_properties(asr), name); } /** @@ -1069,262 +993,3 @@ xbt_dict_t MSG_as_router_get_properties(const char* asr) 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 - * - * \brief Return the last value returned by a MSG function (except - * MSG_get_errno...). - */ -msg_error_t MSG_get_errno(void) -{ - return PROCESS_GET_ERRNO(); -} - -/** \ingroup msg_deprecated_functions - * \brief Put a task on a channel of an host and waits for the end of the - * transmission. - * - * This function is used for describing the behavior of a process. It - * takes three parameter. - * \param task a #msg_task_t to send on another location. This task - will not be usable anymore when the function will return. There is - no automatic task duplication and you have to save your parameters - before calling this function. Tasks are unique and once it has been - sent to another location, you should not access it anymore. You do - not need to call MSG_task_destroy() but to avoid using, as an - effect of inattention, this task anymore, you definitely should - renitialize it with #MSG_TASK_UNINITIALIZED. Note that this task - can be transfered iff it has been correctly created with - MSG_task_create(). - * \param dest the destination of the message - * \param channel the channel on which the process should put this - task. This value has to be >=0 and < than the maximal number of - channels fixed with MSG_set_channel_number(). - * \return #MSG_HOST_FAILURE if the host on which - * this function was called was shut down, - * #MSG_TRANSFER_FAILURE if the transfer could not be properly done - * (network failure, dest failure) or #MSG_OK if it succeeded. - */ -msg_error_t MSG_task_put(msg_task_t task, msg_host_t dest, m_channel_t channel) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_send"); - return MSG_task_put_with_timeout(task, dest, channel, -1.0); -} - -/** \ingroup msg_deprecated_functions - * \brief Does exactly the same as MSG_task_put but with a bounded transmition - * rate. - * - * \sa MSG_task_put - */ -msg_error_t -MSG_task_put_bounded(msg_task_t task, msg_host_t dest, m_channel_t channel, - double maxrate) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_send_bounded"); - task->simdata->rate = maxrate; - return MSG_task_put(task, dest, channel); -} - -/** \ingroup msg_deprecated_functions - * - * \brief Put a task on a channel of an - * host (with a timeout on the waiting of the destination host) and - * waits for the end of the transmission. - * - * This function is used for describing the behavior of a process. It - * takes four parameter. - * \param task a #msg_task_t to send on another location. This task - will not be usable anymore when the function will return. There is - no automatic task duplication and you have to save your parameters - before calling this function. Tasks are unique and once it has been - sent to another location, you should not access it anymore. You do - not need to call MSG_task_destroy() but to avoid using, as an - effect of inattention, this task anymore, you definitely should - renitialize it with #MSG_TASK_UNINITIALIZED. Note that this task - can be transfered iff it has been correctly created with - MSG_task_create(). - * \param dest the destination of the message - * \param channel the channel on which the process should put this - task. This value has to be >=0 and < than the maximal number of - channels fixed with MSG_set_channel_number(). - * \param timeout the maximum time to wait for a task before giving - up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task - will not be modified - * \return #MSG_HOST_FAILURE if the host on which -this function was called was shut down, -#MSG_TRANSFER_FAILURE if the transfer could not be properly done -(network failure, dest failure, timeout...) or #MSG_OK if the communication succeeded. - */ -msg_error_t -MSG_task_put_with_timeout(msg_task_t task, msg_host_t dest, - m_channel_t channel, double timeout) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_send_with_timeout"); - xbt_assert((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); - - XBT_DEBUG("MSG_task_put_with_timout: Trying to send a task to '%s'", MSG_host_get_name(dest)); - return - MSG_mailbox_put_with_timeout(MSG_mailbox_get_by_channel - (dest, channel), task, timeout); -} - -/** \ingroup msg_deprecated_functions - * \brief Test whether there is a pending communication on a channel, and who sent it. - * - * It takes one parameter. - * \param channel the channel on which the process should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \return -1 if there is no pending communication and the PID of the process who sent it otherwise - */ -int MSG_task_probe_from(m_channel_t channel) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_listen_from"); - msg_task_t task; - - xbt_assert((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); - - if (NULL == - (task = - MSG_mailbox_get_head(MSG_mailbox_get_by_channel - (MSG_host_self(), channel)))) - return -1; - - return MSG_process_get_PID(task->simdata->sender); -} - -/** \ingroup msg_deprecated_functions - * \brief Test whether there is a pending communication on a channel. - * - * It takes one parameter. - * \param channel the channel on which the process should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \return 1 if there is a pending communication and 0 otherwise - */ -int MSG_task_Iprobe(m_channel_t channel) -{ - XBT_WARN("DEPRECATED!"); - xbt_assert((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); - - return - !MSG_mailbox_is_empty(MSG_mailbox_get_by_channel - (MSG_host_self(), channel)); -} - -/** \ingroup msg_deprecated_functions - - * \brief Return the number of tasks waiting to be received on a \a - channel and sent by \a host. - * - * It takes two parameters. - * \param channel the channel on which the process should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \param host the host that is to be watched. - * \return the number of tasks waiting to be received on \a channel - and sent by \a host. - */ -int MSG_task_probe_from_host(int channel, msg_host_t host) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_listen_from_host"); - xbt_assert((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); - - return - MSG_mailbox_get_count_host_waiting_tasks(MSG_mailbox_get_by_channel - (MSG_host_self(), channel), - host); - -} - -/** \ingroup msg_deprecated_functions - * \brief Listen on \a channel and waits for receiving a task from \a host. - * - * It takes three parameters. - * \param task a memory location for storing a #msg_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. - * \param channel the channel on which the process should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \param host the host that is to be watched. - * \return a #msg_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise. - */ -msg_error_t -MSG_task_get_from_host(msg_task_t * task, m_channel_t channel, msg_host_t host) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_receive_from_host"); - return MSG_task_get_ext(task, channel, -1, host); -} - -/** \ingroup msg_deprecated_functions - * \brief Listen on a channel and wait for receiving a task. - * - * It takes two parameters. - * \param task a memory location for storing a #msg_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. - * \param channel the channel on which the process should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \return a #msg_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise. - */ -msg_error_t MSG_task_get(msg_task_t * task, m_channel_t channel) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_receive"); - return MSG_task_get_with_timeout(task, channel, -1); -} - -/** \ingroup msg_deprecated_functions - * \brief Listen on a channel and wait for receiving a task with a timeout. - * - * It takes three parameters. - * \param task a memory location for storing a #msg_task_t. It will - hold a task when this function will return. Thus \a task should not - be equal to \c NULL and \a *task should be equal to \c NULL. If one of - those two condition does not hold, there will be a warning message. - * \param channel the channel on which the process should be - listening. This value has to be >=0 and < than the maximal - number of channels fixed with MSG_set_channel_number(). - * \param max_duration the maximum time to wait for a task before giving - up. In such a case, #MSG_TRANSFER_FAILURE will be returned, \a task - will not be modified and will still be - equal to \c NULL when returning. - * \return a #msg_error_t indicating whether the operation was successful (#MSG_OK), or why it failed otherwise. - */ -msg_error_t -MSG_task_get_with_timeout(msg_task_t * task, m_channel_t channel, - double max_duration) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_receive_with_timeout"); - return MSG_task_get_ext(task, channel, max_duration, NULL); -} - -msg_error_t -MSG_task_get_ext(msg_task_t * task, m_channel_t channel, double timeout, - msg_host_t host) -{ - XBT_WARN("DEPRECATED! Now use MSG_task_receive_ext"); - xbt_assert((channel >= 0) - && (channel < msg_global->max_channel), "Invalid channel %d", - channel); - - return - MSG_mailbox_get_task_ext(MSG_mailbox_get_by_channel - (MSG_host_self(), channel), task, host, - timeout); -} - -#endif