X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d8eb62b207b566949a0d9ce649a7b21e226b9168..de29f3985505e3db5a0aba8d0ef844f21e971f11:/src/msg/msg_gos.cpp diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index b7429cb092..81b3e33051 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -1,10 +1,12 @@ -/* Copyright (c) 2004-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2019. 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 +#include "simgrid/Exception.hpp" +#include +#include "simgrid/s4u/Comm.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "src/instr/instr_private.hpp" #include "src/kernel/activity/ExecImpl.hpp" @@ -13,7 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)"); -/** @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. @@ -25,7 +27,7 @@ msg_error_t MSG_task_execute(msg_task_t task) return MSG_parallel_task_execute(task); } -/** @ingroup msg_task_usage +/** * @brief Executes a parallel task and waits for its termination. * * @param task a #msg_task_t to execute on the location on which the process is running. @@ -44,7 +46,6 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo e_smx_state_t comp_state; msg_error_t status = MSG_OK; - TRACE_msg_task_execute_start(task); xbt_assert((not simdata->compute) && not task->simdata->isused, "This task is executed somewhere else. Go fix your code!"); @@ -52,10 +53,12 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self())); if (simdata->flops_amount <= 0.0 && not simdata->host_nb) { - TRACE_msg_task_execute_end(task); return MSG_OK; } + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->push_event("execute"); + try { simdata->setUsed(); @@ -65,75 +68,47 @@ msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeo task->name ?: "", simdata->host_nb, simdata->host_list, simdata->flops_parallel_amount, simdata->bytes_parallel_amount, -1.0, timeout)); XBT_DEBUG("Parallel execution action created: %p", simdata->compute.get()); + if (task->category != nullptr) + simgrid::simix::simcall([task] { task->simdata->compute->set_category(task->category); }); } else { - simdata->compute = boost::static_pointer_cast( - simcall_execution_start(task->name ?: "", simdata->flops_amount, simdata->priority, simdata->bound, - MSG_process_get_host(MSG_process_self()))); + sg_host_t host = MSG_process_get_host(MSG_process_self()); + simdata->compute = simgrid::simix::simcall([task, host] { + return simgrid::kernel::activity::ExecImplPtr( + new simgrid::kernel::activity::ExecImpl(task->name ?: "", task->category ?: "", + /*timeout_detector*/ nullptr, host)); + }); + /* checking for infinite values */ + xbt_assert(std::isfinite(simdata->flops_amount), "flops_amount is not finite!"); + xbt_assert(std::isfinite(simdata->priority), "priority is not finite!"); + + simdata->compute->start(simdata->flops_amount, simdata->priority, simdata->bound); } - simcall_set_category(simdata->compute, task->category); + comp_state = simcall_execution_wait(simdata->compute); simdata->setNotUsed(); XBT_DEBUG("Execution task '%s' finished in state %d", task->name, (int)comp_state); - } - catch (xbt_ex& e) { - switch (e.category) { - case cancel_error: - status = MSG_TASK_CANCELED; - break; - case host_error: - status = MSG_HOST_FAILURE; - break; - case timeout_error: - status = MSG_TIMEOUT; - break; - default: - throw; - } + } catch (simgrid::HostFailureException& e) { + status = MSG_HOST_FAILURE; + } catch (simgrid::TimeoutError& e) { + status = MSG_TIMEOUT; + } catch (simgrid::CancelException& e) { + status = MSG_TASK_CANCELED; } /* action ended, set comm and compute = nullptr, the actions is already destroyed in the main function */ simdata->flops_amount = 0.0; simdata->comm = nullptr; simdata->compute = nullptr; - TRACE_msg_task_execute_end(task); - return status; -} - -/** @ingroup msg_task_usage - * @brief Sleep for the specified number of seconds - * - * Makes the current process sleep until @a time seconds have elapsed. - * - * @param nb_sec a number of second - */ -msg_error_t MSG_process_sleep(double nb_sec) -{ - msg_error_t status = MSG_OK; - - try { - simgrid::s4u::this_actor::sleep_for(nb_sec); - } - catch(xbt_ex& e) { - if (e.category == cancel_error) { - XBT_DEBUG("According to the JAVA API, a sleep call should only deal with HostFailureException, I'm lost."); - // adsein: MSG_TASK_CANCELED is assigned when someone kills the process that made the sleep, this is not - // correct. For instance, when the node is turned off, the error should be MSG_HOST_FAILURE, which is by the way - // and according to the JAVA document, the only exception that can be triggered by MSG_Process_sleep call. - // To avoid possible impacts in the code, I just raised a host_failure exception for the moment in the JAVA code - // and did not change anythings at the C level. - // See comment in the jmsg_process.c file, function JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_sleep(JNIEnv *env, jclass cls, jlong jmillis, jint jnanos) - status = MSG_TASK_CANCELED; - } else - throw; - } + if (TRACE_actor_is_enabled()) + simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->pop_event(); return status; } -/** @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 @@ -151,7 +126,7 @@ 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. @@ -172,7 +147,7 @@ msg_error_t MSG_task_receive_bounded(msg_task_t * task, const char *alias, doubl 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. * * This is a blocking function with a timeout, the execution flow will be blocked until the task is received or the @@ -192,7 +167,7 @@ msg_error_t MSG_task_receive_with_timeout(msg_task_t * task, const char *alias, return MSG_task_receive_ext(task, alias, timeout, nullptr); } -/** @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. @@ -214,7 +189,7 @@ msg_error_t MSG_task_receive_with_timeout_bounded(msg_task_t * task, const char return MSG_task_receive_ext_bounded(task, alias, timeout, nullptr, rate); } -/** @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 @@ -236,7 +211,7 @@ msg_error_t MSG_task_receive_ext(msg_task_t * task, const char *alias, double ti return MSG_task_receive_ext_bounded(task, alias, timeout, host, -1.0); } -/** @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. @@ -258,14 +233,11 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d double rate) { XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(alias); msg_error_t ret = MSG_OK; /* We no longer support getting a task from a specific host */ if (host) THROW_UNIMPLEMENTED; - TRACE_msg_task_get_start(); - /* Sanity check */ xbt_assert(task, "Null pointer for the task storage"); @@ -274,26 +246,26 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t * task, const char *alias, d /* Try to receive it by calling SIMIX network layer */ try { - simcall_comm_recv(MSG_process_self()->get_impl(), mailbox->get_impl(), task, nullptr, nullptr, nullptr, nullptr, - timeout, rate); - XBT_DEBUG("Got task %s from %s", (*task)->name, mailbox->get_cname()); + void* payload; + simgrid::s4u::Mailbox::by_name(alias) + ->get_init() + ->set_dst_data(&payload, sizeof(msg_task_t*)) + ->set_rate(rate) + ->wait_for(timeout); + *task = static_cast(payload); + XBT_DEBUG("Got task %s from %s", (*task)->name, alias); (*task)->simdata->setNotUsed(); - } - catch (xbt_ex& e) { - switch (e.category) { - case host_error: - case cancel_error: - ret = MSG_HOST_FAILURE; - break; - case network_error: + } catch (simgrid::HostFailureException& e) { + ret = MSG_HOST_FAILURE; + } catch (simgrid::TimeoutError& e) { + ret = MSG_TIMEOUT; + } catch (simgrid::CancelException& e) { + ret = MSG_HOST_FAILURE; + } catch (xbt_ex& e) { + if (e.category == network_error) ret = MSG_TRANSFER_FAILURE; - break; - case timeout_error: - ret = MSG_TIMEOUT; - break; - default: + else throw; - } } if (ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) { @@ -319,25 +291,27 @@ static inline msg_comm_t MSG_task_isend_internal(msg_task_t task, const char* al t_simdata->comm = nullptr; msg_global->sent_msg++; - /* Send it by calling SIMIX network layer */ - smx_activity_t act = - simcall_comm_isend(myself->get_impl(), mailbox->get_impl(), t_simdata->bytes_amount, t_simdata->rate, task, - sizeof(void*), nullptr, cleanup, nullptr, nullptr, detached); - t_simdata->comm = boost::static_pointer_cast(act); + simgrid::s4u::CommPtr comm = mailbox->put_init(task, t_simdata->bytes_amount)->set_rate(t_simdata->rate); + t_simdata->comm = comm; + if (detached) + comm->detach(cleanup); + else + comm->start(); - msg_comm_t comm = nullptr; + msg_comm_t msg_comm = nullptr; if (not detached) { - comm = new simgrid::msg::Comm(task, nullptr, act); + msg_comm = new simgrid::msg::Comm(task, nullptr, comm); } - if (TRACE_is_enabled()) - simcall_set_category(act, task->category); + if (TRACE_is_enabled() && task->category != nullptr) + simgrid::simix::simcall([comm, task] { comm->get_impl()->set_category(task->category); }); + TRACE_msg_task_put_end(); - return comm; + return msg_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. @@ -351,7 +325,7 @@ msg_comm_t MSG_task_isend(msg_task_t task, const char *alias) return MSG_task_isend_internal(task, alias, nullptr, 0); } -/** @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 @@ -368,7 +342,7 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char *alias, double max return MSG_task_isend_internal(task, alias, nullptr, 0); } -/** @ingroup msg_task_usage +/** * @brief Sends a task on a mailbox. * * This is a non blocking detached send function. @@ -389,7 +363,7 @@ void MSG_task_dsend(msg_task_t task, const char *alias, void_f_pvoid_t cleanup) xbt_assert(comm == nullptr); } -/** @ingroup msg_task_usage +/** * @brief Sends a task on a mailbox with a maximal rate. * * This is a non blocking detached send function. @@ -418,7 +392,7 @@ void MSG_task_dsend_bounded(msg_task_t task, const char *alias, void_f_pvoid_t c MSG_task_dsend(task, alias, cleanup); } -/** @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. @@ -432,7 +406,7 @@ msg_comm_t MSG_task_irecv(msg_task_t *task, const char *name) return MSG_task_irecv_bounded(task, name, -1.0); } -/** @ingroup msg_task_usage +/** * @brief Starts listening for receiving a task from an asynchronous communication at a given rate. * * The rate parameter can be used to receive a task with a limited @@ -458,13 +432,12 @@ msg_comm_t MSG_task_irecv_bounded(msg_task_t *task, const char *name, double rat /* Try to receive it by calling SIMIX network layer */ msg_comm_t comm = new simgrid::msg::Comm( - nullptr, task, - simcall_comm_irecv(SIMIX_process_self(), mbox->get_impl(), task, nullptr, nullptr, nullptr, nullptr, rate)); + nullptr, task, mbox->get_init()->set_dst_data((void**)task, sizeof(msg_task_t*))->set_rate(rate)->start()); return comm; } -/** @ingroup msg_task_usage +/** * @brief Checks whether a communication is done, and if yes, finalizes it. * @param comm the communication to test * @return 'true' if the communication is finished @@ -477,31 +450,28 @@ int MSG_comm_test(msg_comm_t comm) bool finished = false; try { - finished = simcall_comm_test(comm->s_comm); + finished = comm->s_comm->test(); if (finished && comm->task_received != nullptr) { /* I am the receiver */ (*comm->task_received)->simdata->setNotUsed(); } + } catch (simgrid::TimeoutError& e) { + comm->status = MSG_TIMEOUT; + finished = true; } catch (xbt_ex& e) { - switch (e.category) { - case network_error: - comm->status = MSG_TRANSFER_FAILURE; - finished = true; - break; - case timeout_error: - comm->status = MSG_TIMEOUT; - finished = true; - break; - default: - throw; + if (e.category == network_error) { + comm->status = MSG_TRANSFER_FAILURE; + finished = true; + } else { + throw; } } return finished; } -/** @ingroup msg_task_usage +/** * @brief This function checks if a communication is finished. * @param comms a vector of communications * @return the position of the finished communication if any @@ -513,31 +483,26 @@ int MSG_comm_testany(xbt_dynar_t comms) int finished_index = -1; /* Create the equivalent array with SIMIX objects: */ - std::vector s_comms; + std::vector s_comms; s_comms.reserve(xbt_dynar_length(comms)); msg_comm_t comm; unsigned int cursor; xbt_dynar_foreach(comms, cursor, comm) { - s_comms.push_back(comm->s_comm); + s_comms.push_back(static_cast(comm->s_comm->get_impl().get())); } msg_error_t status = MSG_OK; try { finished_index = simcall_comm_testany(s_comms.data(), s_comms.size()); + } catch (simgrid::TimeoutError& e) { + finished_index = e.value; + status = MSG_TIMEOUT; } catch (xbt_ex& e) { - switch (e.category) { - case network_error: - finished_index = e.value; - status = MSG_TRANSFER_FAILURE; - break; - case timeout_error: - finished_index = e.value; - status = MSG_TIMEOUT; - break; - default: - throw; - } + if (e.category != network_error) + throw; + finished_index = e.value; + status = MSG_TRANSFER_FAILURE; } if (finished_index != -1) { @@ -554,17 +519,13 @@ int MSG_comm_testany(xbt_dynar_t comms) return finished_index; } -/** @ingroup msg_task_usage - * @brief Destroys a communication. - * @param comm the communication to destroy. - */ +/** @brief Destroys the provided communication. */ void MSG_comm_destroy(msg_comm_t comm) { delete comm; } -/** @ingroup msg_task_usage - * @brief Wait for the completion of a communication. +/** @brief Wait for the completion of a communication. * * It takes two parameters. * @param comm the communication to wait. @@ -575,7 +536,7 @@ void MSG_comm_destroy(msg_comm_t comm) msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout) { try { - simcall_comm_wait(comm->s_comm, timeout); + comm->s_comm->wait_for(timeout); if (comm->task_received != nullptr) { /* I am the receiver */ @@ -583,25 +544,20 @@ msg_error_t MSG_comm_wait(msg_comm_t comm, double timeout) } /* FIXME: these functions are not traceable */ + } catch (simgrid::TimeoutError& e) { + comm->status = MSG_TIMEOUT; } catch (xbt_ex& e) { - switch (e.category) { - case network_error: + if (e.category == network_error) comm->status = MSG_TRANSFER_FAILURE; - break; - case timeout_error: - comm->status = MSG_TIMEOUT; - break; - default: + else throw; - } } return comm->status; } -/** @ingroup msg_task_usage - * @brief This function is called by a sender and permit to wait for each communication +/** @brief This function is called by a sender and permit to wait for each communication * * @param comm a vector of communication * @param nb_elem is the size of the comm vector @@ -613,8 +569,7 @@ void MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout) MSG_comm_wait(comm[i], timeout); } -/** @ingroup msg_task_usage - * @brief This function waits for the first communication finished in a list. +/** @brief This function waits for the first communication finished in a list. * @param comms a vector of communications * @return the position of the first finished communication * (but it may have failed, use MSG_comm_get_status() to know its status) @@ -623,38 +578,32 @@ int MSG_comm_waitany(xbt_dynar_t comms) { int finished_index = -1; - /* create the equivalent dynar with SIMIX objects */ - xbt_dynar_t s_comms = xbt_dynar_new(sizeof(smx_activity_t), [](void*ptr){ - intrusive_ptr_release(*(simgrid::kernel::activity::ActivityImpl**)ptr); - }); + /* Create the equivalent array with SIMIX objects: */ + std::vector s_comms; + s_comms.reserve(xbt_dynar_length(comms)); msg_comm_t comm; unsigned int cursor; xbt_dynar_foreach(comms, cursor, comm) { - intrusive_ptr_add_ref(comm->s_comm.get()); - xbt_dynar_push_as(s_comms, simgrid::kernel::activity::ActivityImpl*, comm->s_comm.get()); + s_comms.push_back(static_cast(comm->s_comm->get_impl().get())); } msg_error_t status = MSG_OK; try { - finished_index = simcall_comm_waitany(s_comms, -1); + finished_index = simcall_comm_waitany(s_comms.data(), s_comms.size(), -1); + } catch (simgrid::TimeoutError& e) { + finished_index = e.value; + status = MSG_TIMEOUT; } catch(xbt_ex& e) { - switch (e.category) { - case network_error: - finished_index = e.value; - status = MSG_TRANSFER_FAILURE; - break; - case timeout_error: - finished_index = e.value; - status = MSG_TIMEOUT; - break; - default: - throw; + if (e.category == network_error) { + finished_index = e.value; + status = MSG_TRANSFER_FAILURE; + } else { + throw; } } xbt_assert(finished_index != -1, "WaitAny returned -1"); - xbt_dynar_free(&s_comms); comm = xbt_dynar_get_as(comms, finished_index, msg_comm_t); /* the communication is finished */ @@ -669,7 +618,6 @@ int MSG_comm_waitany(xbt_dynar_t comms) } /** - * @ingroup msg_task_usage * @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 occurred @@ -680,8 +628,7 @@ msg_error_t MSG_comm_get_status(msg_comm_t comm) { return comm->status; } -/** @ingroup msg_task_usage - * @brief Get a task (#msg_task_t) from a communication +/** @brief Get a task (#msg_task_t) from a communication * * @param comm the communication where to get the task * @return the task from the communication @@ -695,25 +642,22 @@ msg_task_t MSG_comm_get_task(msg_comm_t comm) /** * @brief This function is called by SIMIX in kernel mode to copy the data of a comm. - * @param synchro the comm + * @param comm the comm * @param buff the data copied * @param buff_size size of the buffer */ -void MSG_comm_copy_data_from_SIMIX(smx_activity_t synchro, void* buff, size_t buff_size) +void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommImpl* comm, void* buff, size_t buff_size) { - simgrid::kernel::activity::CommImplPtr comm = - boost::static_pointer_cast(synchro); - 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 = static_cast(buff); - msg_global->task_copy_callback(task, comm->src_proc->ciface(), comm->dst_proc->ciface()); + msg_global->task_copy_callback(task, comm->src_actor_->ciface(), comm->dst_actor_->ciface()); } } -/** @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 on the other @@ -732,7 +676,7 @@ msg_error_t MSG_task_send(msg_task_t task, const char *alias) return MSG_task_send_with_timeout(task, alias, -1); } -/** @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 @@ -756,7 +700,7 @@ msg_error_t MSG_task_send_bounded(msg_task_t task, const char *alias, double max return MSG_task_send(task, alias); } -/** @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. @@ -771,56 +715,44 @@ msg_error_t MSG_task_send_bounded(msg_task_t task, const char *alias, double max msg_error_t MSG_task_send_with_timeout(msg_task_t task, const char *alias, double timeout) { msg_error_t ret = MSG_OK; - simdata_task_t t_simdata = nullptr; - msg_process_t process = MSG_process_self(); - simgrid::s4u::MailboxPtr mailbox = simgrid::s4u::Mailbox::by_name(alias); TRACE_msg_task_put_start(task); /* Prepare the task to send */ - t_simdata = task->simdata; - t_simdata->sender = process; + simdata_task_t t_simdata = task->simdata; + t_simdata->sender = MSG_process_self(); t_simdata->source = MSG_host_self(); - t_simdata->setUsed(); - t_simdata->comm = nullptr; msg_global->sent_msg++; - /* Try to send it by calling SIMIX network layer */ + /* Try to send it */ try { - smx_activity_t comm = nullptr; /* MC needs the comm to be set to nullptr during the simix call */ - comm = simcall_comm_isend(SIMIX_process_self(), mailbox->get_impl(), t_simdata->bytes_amount, t_simdata->rate, task, - sizeof(void*), nullptr, nullptr, nullptr, nullptr, 0); - if (TRACE_is_enabled()) - simcall_set_category(comm, task->category); - t_simdata->comm = boost::static_pointer_cast(comm); - simcall_comm_wait(comm, timeout); - } - catch (xbt_ex& e) { - switch (e.category) { - case cancel_error: - ret = MSG_HOST_FAILURE; - break; - case network_error: + simgrid::s4u::CommPtr comm = + simgrid::s4u::Mailbox::by_name(alias)->put_init(task, t_simdata->bytes_amount)->set_rate(t_simdata->rate); + t_simdata->comm = comm; + comm->start(); + if (TRACE_is_enabled() && task->category != nullptr) + simgrid::simix::simcall([comm, task] { comm->get_impl()->set_category(task->category); }); + comm->wait_for(timeout); + } catch (simgrid::TimeoutError& e) { + ret = MSG_TIMEOUT; + } catch (simgrid::CancelException& e) { + ret = MSG_HOST_FAILURE; + } catch (xbt_ex& e) { + if (e.category == network_error) ret = MSG_TRANSFER_FAILURE; - break; - case timeout_error: - ret = MSG_TIMEOUT; - break; - default: + else throw; - } /* If the send failed, it is not used anymore */ t_simdata->setNotUsed(); } - TRACE_msg_task_put_end(); 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. @@ -844,7 +776,7 @@ msg_error_t MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alia return MSG_task_send_with_timeout(task, alias, timeout); } -/** @ingroup msg_task_usage +/** * @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 @@ -854,17 +786,12 @@ msg_error_t MSG_task_send_with_timeout_bounded(msg_task_t task, const char *alia */ int MSG_task_listen_from(const char *alias) { - simgrid::s4u::MailboxPtr mbox = simgrid::s4u::Mailbox::by_name(alias); - simgrid::kernel::activity::CommImplPtr comm = - boost::static_pointer_cast(mbox->front()); + simgrid::kernel::activity::CommImplPtr comm = simgrid::s4u::Mailbox::by_name(alias)->front(); - if (not comm) - return -1; - - return MSG_process_get_PID(static_cast(comm->src_buff)->simdata->sender); + return comm ? MSG_process_get_PID(static_cast(comm->src_buff_)->simdata->sender) : -1; } -/** @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 @@ -884,8 +811,7 @@ void MSG_task_set_category (msg_task_t task, const char *category) TRACE_msg_set_task_category (task, category); } -/** @ingroup msg_task_usage - * +/** * @brief Gets the current tracing category of a task. * * @param task the task to be considered