X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4d02714ee138a3bd9b02e0064b7a2aa26407e9e8..48d16e98696450e0dc1ae85cfb8f84b41d15b409:/src/msg/msg_gos.cpp diff --git a/src/msg/msg_gos.cpp b/src/msg/msg_gos.cpp index a003ad9b41..88a6c3af0e 100644 --- a/src/msg/msg_gos.cpp +++ b/src/msg/msg_gos.cpp @@ -6,77 +6,15 @@ #include #include "simgrid/Exception.hpp" +#include "simgrid/s4u/Actor.hpp" #include "simgrid/s4u/Comm.hpp" +#include "simgrid/s4u/Exec.hpp" #include "simgrid/s4u/Mailbox.hpp" #include "src/instr/instr_private.hpp" -#include "src/kernel/activity/ExecImpl.hpp" #include "src/msg/msg_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_gos, msg, "Logging specific to MSG (gos)"); -/** - * @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. - * - * @return #MSG_OK if the task was successfully completed, #MSG_TASK_CANCELED or #MSG_HOST_FAILURE otherwise - */ -msg_error_t MSG_parallel_task_execute(msg_task_t task) -{ - return MSG_parallel_task_execute_with_timeout(task, -1); -} - -msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeout) -{ - e_smx_state_t comp_state; - msg_error_t status = MSG_OK; - - xbt_assert((not task->compute) && not task->is_used(), "This task is executed somewhere else. Go fix your code!"); - - XBT_DEBUG("Computing on %s", MSG_process_get_name(MSG_process_self())); - - if (task->flops_amount <= 0.0 && not task->hosts_.empty()) { - 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 { - task->set_used(); - - task->compute = boost::static_pointer_cast(simcall_execution_parallel_start( - std::move(task->get_name()), task->hosts_.size(), task->hosts_.data(), - (task->flops_parallel_amount.empty() ? nullptr : task->flops_parallel_amount.data()), - (task->bytes_parallel_amount.empty() ? nullptr : task->bytes_parallel_amount.data()), -1.0, timeout)); - XBT_DEBUG("Parallel execution action created: %p", task->compute.get()); - if (task->has_tracing_category()) - simgrid::simix::simcall([task] { task->compute->set_category(std::move(task->get_tracing_category())); }); - - comp_state = simcall_execution_wait(task->compute); - - task->set_not_used(); - - XBT_DEBUG("Execution task '%s' finished in state %d", task->get_cname(), (int)comp_state); - } 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 */ - task->flops_amount = 0.0; - task->comm = nullptr; - task->compute = nullptr; - - if (TRACE_actor_is_enabled()) - simgrid::instr::Container::by_name(instr_pid(MSG_process_self()))->get_state("ACTOR_STATE")->pop_event(); - - return status; -} - /** * @brief Receives a task from a mailbox. * @@ -520,107 +458,6 @@ void MSG_comm_copy_data_from_SIMIX(simgrid::kernel::activity::CommImpl* comm, vo } } -/** - * @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 - * side if #MSG_task_receive is used). - * See #MSG_task_isend for sending tasks asynchronously. - * - * @param task the task to be sent - * @param alias the mailbox name to where the task is sent - * - * @return Returns #MSG_OK if the task was successfully sent, - * #MSG_HOST_FAILURE, or #MSG_TRANSFER_FAILURE otherwise. - */ -msg_error_t MSG_task_send(msg_task_t task, const char *alias) -{ - XBT_DEBUG("MSG_task_send: Trying to send a message on mailbox '%s'", alias); - return MSG_task_send_with_timeout(task, alias, -1); -} - -/** - * @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. - * - * The maxrate parameter can be used to send a task with a limited bandwidth (smaller than the physical available - * value). Use MSG_task_send() if you don't limit the rate (or pass -1 as a rate value do disable this feature). - * - * @param task the task to be sent - * @param alias the mailbox name to where the task is sent - * @param maxrate the maximum communication rate for sending this task (byte/sec) - * - * @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) -{ - task->set_rate(maxrate); - return MSG_task_send(task, alias); -} - -/** - * @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. - * - * @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) - * - * @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 ret = MSG_OK; - /* Try to send it */ - try { - simgrid::s4u::CommPtr comm = task->send_async(alias, nullptr, false); - task->comm = comm; - 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; - else - throw; - - /* If the send failed, it is not used anymore */ - task->set_not_used(); - } - - return ret; -} - -/** - * @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. - * - * The maxrate parameter can be used to send a task with a limited bandwidth (smaller than the physical available - * value). Use MSG_task_send_with_timeout() if you don't limit the rate (or pass -1 as a rate value do disable this - * feature). - * - * @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 (byte/sec) - * - * @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->set_rate(maxrate); - return MSG_task_send_with_timeout(task, alias, timeout); -} - /** * @brief Look if there is a communication on a mailbox and return the PID of the sender process. *