X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/11932d0967b5a5bc7a5c0e8a0b34778dc4c5c0cd..8b3c1c7507bdf1c21b9484fac5c09b8420ca25c3:/src/msg/msg_task.cpp diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index 786ebea5e0..f87e1d8561 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -19,10 +19,11 @@ namespace simgrid { namespace msg { Task::Task(const std::string& name, double flops_amount, double bytes_amount, void* data) - : name_(name), userdata_(data), flops_amount(flops_amount), bytes_amount(bytes_amount) + : name_(name), flops_amount(flops_amount), bytes_amount(bytes_amount) { static std::atomic_ullong counter{0}; id_ = counter++; + set_data(data); if (MC_is_active()) MC_ignore_heap(&(id_), sizeof(id_)); } @@ -45,7 +46,7 @@ Task* Task::create(const std::string& name, double flops_amount, double bytes_am Task* Task::create_parallel(const std::string& name, int host_nb, const msg_host_t* host_list, double* flops_amount, double* bytes_amount, void* data) { - std::vector hosts(host_list, host_list + host_nb); + std::vector hosts(host_list, host_list + host_nb); std::vector flops; std::vector bytes; if (flops_amount != nullptr) @@ -81,11 +82,11 @@ msg_error_t Task::execute() set_not_used(); XBT_DEBUG("Execution task '%s' finished", get_cname()); - } catch (HostFailureException& e) { + } catch (const HostFailureException&) { status = MSG_HOST_FAILURE; - } catch (TimeoutError& e) { + } catch (const TimeoutException&) { status = MSG_TIMEOUT; - } catch (CancelException& e) { + } catch (const CancelException&) { status = MSG_TASK_CANCELED; } @@ -100,9 +101,9 @@ msg_error_t Task::execute() s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup, bool detached) { if (TRACE_actor_is_enabled()) { - container_t process_container = simgrid::instr::Container::by_name(instr_pid(*MSG_process_self())); + container_t process_container = 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); + instr::Container::get_root()->get_link("ACTOR_TASK_LINK")->start_event(process_container, "SR", key); } /* Prepare the task to send */ @@ -111,6 +112,9 @@ s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup, msg_global->sent_msg++; s4u::CommPtr s4u_comm = s4u::Mailbox::by_name(alias)->put_init(this, bytes_amount)->set_rate(get_rate()); + if (TRACE_is_enabled() && has_tracing_category()) + s4u_comm->set_tracing_category(tracing_category_); + comm = s4u_comm; if (detached) @@ -118,9 +122,6 @@ s4u::CommPtr Task::send_async(const std::string& alias, void_f_pvoid_t cleanup, else comm->start(); - if (TRACE_is_enabled() && has_tracing_category()) - simgrid::simix::simcall([this] { comm->get_impl()->set_category(std::move(tracing_category_)); }); - return comm; } @@ -133,16 +134,12 @@ msg_error_t Task::send(const std::string& alias, double timeout) s4u::CommPtr s4u_comm = send_async(alias, nullptr, false); comm = s4u_comm; comm->wait_for(timeout); - } catch (simgrid::TimeoutError& e) { + } catch (const TimeoutException&) { ret = MSG_TIMEOUT; - } catch (simgrid::CancelException& e) { + } catch (const CancelException&) { ret = MSG_HOST_FAILURE; - } catch (xbt_ex& e) { - if (e.category == network_error) - ret = MSG_TRANSFER_FAILURE; - else - throw; - + } catch (const NetworkFailureException&) { + ret = MSG_TRANSFER_FAILURE; /* If the send failed, it is not used anymore */ set_not_used(); } @@ -167,7 +164,7 @@ void Task::set_priority(double priority) s4u::Actor* Task::get_sender() { - return comm ? comm->get_sender().get() : nullptr; + return comm ? comm->get_sender() : nullptr; } s4u::Host* Task::get_source() @@ -207,7 +204,7 @@ void Task::report_multiple_use() const * @param flop_amount a value of the processing amount (in flop) needed to process this new task. * If 0, then it cannot be executed with MSG_task_execute(). This value has to be >=0. * @param message_size a value of the amount of data (in bytes) needed to transfer this new task. If 0, then it cannot - * be transfered with MSG_task_send() and MSG_task_recv(). This value has to be >=0. + * be transferred with MSG_task_send() and MSG_task_recv(). This value has to be >=0. * @param data a pointer to any data may want to attach to the new object. It is for user-level information and can * be nullptr. It can be retrieved with the function @ref MSG_task_get_data. * @return The new corresponding object. @@ -247,28 +244,13 @@ msg_task_t MSG_parallel_task_create(const char *name, int host_nb, const msg_hos /** @brief Return the user data of the given task */ void* MSG_task_get_data(msg_task_t task) { - return task->get_user_data(); + return task->get_data(); } /** @brief Sets the user data of a given task */ void MSG_task_set_data(msg_task_t task, void *data) { - task->set_user_data(data); -} - -/** @brief Sets a function to be called when a task has just been copied. - * @param callback a callback function - */ -// deprecated -void MSG_task_set_copy_callback(void (*callback) (msg_task_t task, msg_process_t sender, msg_process_t receiver)) { - - msg_global->task_copy_callback = callback; - - if (callback) { - SIMIX_comm_set_copy_data_callback(MSG_comm_copy_data_from_SIMIX); - } else { - SIMIX_comm_set_copy_data_callback(SIMIX_comm_copy_pointer_callback); - } + task->set_data(data); } /** @brief Returns the sender of the given task */ @@ -536,7 +518,7 @@ msg_error_t MSG_task_receive_bounded(msg_task_t* task, const char* alias, double */ msg_error_t MSG_task_receive_with_timeout(msg_task_t* task, const char* alias, double timeout) { - return MSG_task_receive_ext_bounded(task, alias, timeout, nullptr, -1); + return MSG_task_receive_with_timeout_bounded(task, alias, timeout, -1); } /** @@ -558,55 +540,8 @@ msg_error_t MSG_task_receive_with_timeout(msg_task_t* task, const char* alias, d */ 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, nullptr, rate); -} - -/** - * @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 - * to obtain an infinite timeout. - * - * @param task a memory location for storing a #msg_task_t. - * @param alias name of the mailbox to receive the task from - * @param timeout is the maximum wait time for completion (provide -1 for no timeout) - * @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, or #MSG_TIMEOUT otherwise. - */ -msg_error_t MSG_task_receive_ext(msg_task_t* task, const char* alias, double timeout, msg_host_t host) -{ - XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias); - return MSG_task_receive_ext_bounded(task, alias, timeout, host, -1.0); -} - -/** - * @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 - * @param timeout is the maximum wait time for completion (provide -1 for no timeout) - * @param host a #msg_host_t host from where the task was sent - * @param rate limit the reception to rate bandwidth (byte/sec) - * - * The rate parameter can be used to receive a task with a limited bandwidth (smaller than the physical available - * value). Use MSG_task_receive_ext() if you don't limit the rate (or pass -1 as a rate value do disable this feature). - * - * @return Returns - * #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) -{ - XBT_DEBUG("MSG_task_receive_ext: Trying to receive a message on mailbox '%s'", alias); + XBT_DEBUG("MSG_task_receive_with_timeout_bounded: Trying to receive a message on mailbox '%s'", alias); msg_error_t ret = MSG_OK; - /* We no longer support getting a task from a specific host */ - if (host) - THROW_UNIMPLEMENTED; /* Sanity check */ xbt_assert(task, "Null pointer for the task storage"); @@ -625,17 +560,14 @@ msg_error_t MSG_task_receive_ext_bounded(msg_task_t* task, const char* alias, do *task = static_cast(payload); XBT_DEBUG("Got task %s from %s", (*task)->get_cname(), alias); (*task)->set_not_used(); - } catch (simgrid::HostFailureException& e) { + } catch (const simgrid::HostFailureException&) { ret = MSG_HOST_FAILURE; - } catch (simgrid::TimeoutError& e) { + } catch (const simgrid::TimeoutException&) { ret = MSG_TIMEOUT; - } catch (simgrid::CancelException& e) { + } catch (const simgrid::CancelException&) { ret = MSG_TASK_CANCELED; - } catch (xbt_ex& e) { - if (e.category == network_error) - ret = MSG_TRANSFER_FAILURE; - else - throw; + } catch (const simgrid::NetworkFailureException&) { + ret = MSG_TRANSFER_FAILURE; } if (TRACE_actor_is_enabled() && ret != MSG_HOST_FAILURE && ret != MSG_TRANSFER_FAILURE && ret != MSG_TIMEOUT) { @@ -698,8 +630,7 @@ msg_comm_t MSG_task_irecv_bounded(msg_task_t* task, const char* name, double rat * * @param alias the name of the mailbox to be considered * - * @return Returns the PID of sender process, - * -1 if there is no communication in the mailbox.#include + * @return Returns the PID of sender process (or -1 if there is no communication in the mailbox) * */ int MSG_task_listen_from(const char* alias) @@ -738,7 +669,7 @@ msg_error_t MSG_task_destroy(msg_task_t task) /** @brief Cancel the given task * - * If it was currently executed or transfered, the working process is stopped. + * If it was currently executed or transferred, the working process is stopped. */ msg_error_t MSG_task_cancel(msg_task_t task) {