X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/215e195d0c76effd16d25589e27ba093440e13b5..08a29a4221dc5cec95b766cd9b25c95dcc361df9:/src/msg/msg_task.cpp diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index ff509898cf..8068a8d9eb 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -27,8 +27,8 @@ Task::Task(std::string name, double flops_amount, double bytes_amount, void* dat MC_ignore_heap(&(id_), sizeof(id_)); } -Task::Task(std::string name, std::vector hosts, std::vector flops_amount, - std::vector bytes_amount, void* data) +Task::Task(std::string name, std::vector&& hosts, std::vector&& flops_amount, + std::vector&& bytes_amount, void* data) : Task(std::move(name), 1.0, 0, data) { parallel_ = true; @@ -67,17 +67,22 @@ msg_error_t Task::execute() xbt_assert(std::isfinite(flops_amount), "flops_amount is not finite!"); msg_error_t status = MSG_OK; + if (flops_amount <= 0.0) + return MSG_OK; - set_used(); try { - s4u::ExecPtr e = s4u::this_actor::exec_init(flops_amount) - ->set_priority(1 / priority_) - ->set_bound(bound_) - ->set_tracing_category(tracing_category_) - ->start(); - compute = boost::static_pointer_cast(e->get_impl()); - - e->wait(); + set_used(); + if (parallel_) + compute = s4u::this_actor::exec_init(hosts_, flops_parallel_amount, bytes_parallel_amount); + else + compute = s4u::this_actor::exec_init(flops_amount); + + compute->set_name(name_) + ->set_tracing_category(tracing_category_) + ->set_timeout(timeout_) + ->set_priority(1 / priority_) + ->set_bound(bound_) + ->wait(); set_not_used(); XBT_DEBUG("Execution task '%s' finished", get_cname()); @@ -97,17 +102,21 @@ msg_error_t Task::execute() return status; } -Comm* Task::send_async(std::string alias, void_f_pvoid_t cleanup, bool detached) +s4u::CommPtr Task::send_async(std::string alias, void_f_pvoid_t cleanup, bool detached) { - TRACE_msg_task_put_start(this); + if (TRACE_actor_is_enabled()) { + container_t process_container = simgrid::instr::Container::by_name(instr_pid(MSG_process_self())); + std::string key = std::string("p") + std::to_string(get_id()); + simgrid::instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key); + } /* Prepare the task to send */ set_used(); this->comm = nullptr; msg_global->sent_msg++; - s4u::CommPtr comm = s4u::Mailbox::by_name(alias)->put_init(this, bytes_amount)->set_rate(get_rate()); - this->comm = comm; + s4u::CommPtr s4u_comm = s4u::Mailbox::by_name(alias)->put_init(this, bytes_amount)->set_rate(get_rate()); + comm = s4u_comm; if (detached) comm->detach(cleanup); @@ -115,18 +124,40 @@ Comm* Task::send_async(std::string alias, void_f_pvoid_t cleanup, bool detached) comm->start(); if (TRACE_is_enabled() && has_tracing_category()) - simgrid::simix::simcall([comm, this] { comm->get_impl()->set_category(std::move(tracing_category_)); }); + simgrid::simix::simcall([this] { comm->get_impl()->set_category(std::move(tracing_category_)); }); - if (not detached) - return new Comm(this, nullptr, comm); - else - return nullptr; + return comm; } +msg_error_t Task::send(std::string alias, double timeout) +{ + msg_error_t ret = MSG_OK; + /* Try to send it */ + try { + comm = nullptr; // needed, otherwise MC gets confused. + s4u::CommPtr s4u_comm = send_async(alias, nullptr, false); + comm = s4u_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 */ + set_not_used(); + } + + return ret; +} void Task::cancel() { if (compute) { - simgrid::simix::simcall([this] { compute->cancel(); }); + compute->cancel(); } else if (comm) { comm->cancel(); } @@ -279,6 +310,25 @@ msg_error_t MSG_task_execute(msg_task_t task) { return task->execute(); } + +/** + * @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 task->execute(); +} + +msg_error_t MSG_parallel_task_execute_with_timeout(msg_task_t task, double timeout) +{ + task->set_timeout(timeout); + return task->execute(); +} + /** * @brief Sends a task on a mailbox. * @@ -290,7 +340,7 @@ msg_error_t MSG_task_execute(msg_task_t task) */ msg_comm_t MSG_task_isend(msg_task_t task, const char* alias) { - return task->send_async(alias, nullptr, false); + return new simgrid::msg::Comm(task, nullptr, task->send_async(alias, nullptr, false)); } /** @@ -307,7 +357,7 @@ msg_comm_t MSG_task_isend(msg_task_t task, const char* alias) msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char* alias, double maxrate) { task->set_rate(maxrate); - return task->send_async(alias, nullptr, false); + return new simgrid::msg::Comm(task, nullptr, task->send_async(alias, nullptr, false)); } /** @@ -327,8 +377,7 @@ msg_comm_t MSG_task_isend_bounded(msg_task_t task, const char* alias, double max */ void MSG_task_dsend(msg_task_t task, const char* alias, void_f_pvoid_t cleanup) { - msg_comm_t XBT_ATTRIB_UNUSED comm = task->send_async(alias, cleanup, true); - xbt_assert(comm == nullptr); + task->send_async(alias, cleanup, true); } /** @@ -354,7 +403,87 @@ void MSG_task_dsend(msg_task_t task, const char* alias, void_f_pvoid_t cleanup) void MSG_task_dsend_bounded(msg_task_t task, const char* alias, void_f_pvoid_t cleanup, double maxrate) { task->set_rate(maxrate); - MSG_task_dsend(task, alias, cleanup); + task->send_async(alias, cleanup, true); +} +/** + * @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 task->send(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 task->send(alias, -1); +} + +/** + * @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) +{ + return task->send(alias, timeout); +} + +/** + * @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 task->send(alias, timeout); } /** @brief Destroys the given task.