X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..2aadff70152b2c1953b5776045da0ad05b5ac44d:/src/msg/msg_task.cpp diff --git a/src/msg/msg_task.cpp b/src/msg/msg_task.cpp index 7a51afd370..fe32c4b8bb 100644 --- a/src/msg/msg_task.cpp +++ b/src/msg/msg_task.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -6,10 +6,29 @@ #include "msg_private.hpp" #include "src/simix/smx_private.hpp" #include +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(msg_task, msg, "Logging specific to MSG (task)"); -void s_simdata_task_t::reportMultipleUse() const +namespace simgrid { +namespace msg { +Task::~Task() +{ + /* parallel tasks only */ + delete[] host_list; + delete[] flops_parallel_amount; + delete[] bytes_parallel_amount; +} + +void Task::set_used() +{ + if (this->is_used) + this->report_multiple_use(); + this->is_used = true; +} + +void Task::report_multiple_use() const { if (msg_global->debug_multiple_use){ XBT_ERROR("This task is already used in there:"); @@ -22,11 +41,14 @@ void s_simdata_task_t::reportMultipleUse() const "(use --cfg=msg/debug-multiple-use:on to get the backtrace of the other process)"); } } +} // namespace msg +} // namespace simgrid /********************************* Task **************************************/ -/** @brief Creates a new #msg_task_t. +/** @brief Creates a new task + * + * A constructor for msg_task_t taking four arguments. * - * A constructor for #msg_task_t taking four arguments and returning the corresponding object. * @param name a name for the object. It is for user-level information and can be nullptr. * @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. @@ -34,31 +56,22 @@ void s_simdata_task_t::reportMultipleUse() const * be transfered 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. - * @see msg_task_t * @return The new corresponding object. */ msg_task_t MSG_task_create(const char *name, double flop_amount, double message_size, void *data) { - msg_task_t task = new s_msg_task_t; - simdata_task_t simdata = new s_simdata_task_t(); - task->simdata = simdata; - - /* Task structure */ - task->name = xbt_strdup(name); - task->data = data; - - /* Simulator Data */ - simdata->bytes_amount = message_size; - simdata->flops_amount = flop_amount; - - TRACE_msg_task_create(task); - - return task; + return new simgrid::msg::Task(name ? name : "", flop_amount, message_size, data); } -/** @brief Creates a new #msg_task_t (a parallel one....). +/** @brief Creates a new parallel task + * + * A constructor for #msg_task_t taking six arguments. + * + * \rst + * See :cpp:func:`void simgrid::s4u::this_actor::parallel_execute(int, s4u::Host**, double*, double*)` for + * the exact semantic of the parameters. + * \endrst * - * A constructor for #msg_task_t taking six arguments and returning the corresponding object. * @param name a name for the object. It is for user-level information and can be nullptr. * @param host_nb the number of hosts implied in the parallel task. * @param host_list an array of @p host_nb msg_host_t. @@ -67,9 +80,7 @@ msg_task_t MSG_task_create(const char *name, double flop_amount, double message_ * @param bytes_amount an array of @p host_nb* @p host_nb doubles. * @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. - * @see msg_task_t - * @return The new corresponding object. + * It can be retrieved with the function @ref MSG_task_get_data(). */ msg_task_t MSG_parallel_task_create(const char *name, int host_nb, const msg_host_t * host_list, double *flops_amount, double *bytes_amount, void *data) @@ -77,41 +88,33 @@ msg_task_t MSG_parallel_task_create(const char *name, int host_nb, const msg_hos // Task's flops amount is set to an arbitrary value > 0.0 to be able to distinguish, in // MSG_task_get_remaining_work_ratio(), a finished task and a task that has not started yet. msg_task_t task = MSG_task_create(name, 1.0, 0, data); - simdata_task_t simdata = task->simdata; /* Simulator Data specific to parallel tasks */ - simdata->host_nb = host_nb; - simdata->host_list = new sg_host_t[host_nb]; - std::copy_n(host_list, host_nb, simdata->host_list); + task->host_nb = host_nb; + task->host_list = new sg_host_t[host_nb]; + std::copy_n(host_list, host_nb, task->host_list); if (flops_amount != nullptr) { - simdata->flops_parallel_amount = new double[host_nb]; - std::copy_n(flops_amount, host_nb, simdata->flops_parallel_amount); + task->flops_parallel_amount = new double[host_nb]; + std::copy_n(flops_amount, host_nb, task->flops_parallel_amount); } if (bytes_amount != nullptr) { - simdata->bytes_parallel_amount = new double[host_nb * host_nb]; - std::copy_n(bytes_amount, host_nb * host_nb, simdata->bytes_parallel_amount); + task->bytes_parallel_amount = new double[host_nb * host_nb]; + std::copy_n(bytes_amount, host_nb * host_nb, task->bytes_parallel_amount); } return task; } -/** @brief Return the user data of a #msg_task_t. - * - * This function checks whether @a task is a valid pointer and return the user data associated to @a task if possible. - */ -void *MSG_task_get_data(msg_task_t task) +/** @brief Return the user data of the given task */ +void* MSG_task_get_data(msg_task_t task) { - return (task->data); + return task->get_user_data(); } -/** @ingroup m_task_management - * @brief Sets the user data of a #msg_task_t. - * - * This function allows to associate a new pointer to the user data associated of @a task. - */ +/** @brief Sets the user data of a given task */ void MSG_task_set_data(msg_task_t task, void *data) { - task->data = data; + task->set_user_data(data); } /** @brief Sets a function to be called when a task has just been copied. @@ -128,45 +131,33 @@ void MSG_task_set_copy_callback(void (*callback) (msg_task_t task, msg_process_t } } -/** @brief Return the sender of a #msg_task_t. - * - * This functions returns the #msg_process_t which sent this task - */ +/** @brief Returns the sender of the given task */ msg_process_t MSG_task_get_sender(msg_task_t task) { - return task->simdata->sender; + return task->sender; } -/** @brief Return the source of a #msg_task_t. - * - * This functions returns the #msg_host_t from which this task was sent - */ +/** @brief Returns the source (the sender's host) of the given task */ msg_host_t MSG_task_get_source(msg_task_t task) { - return task->simdata->source; + return task->sender->get_host(); } -/** @brief Return the name of a #msg_task_t. - * - * This functions returns the name of a #msg_task_t as specified on creation - */ +/** @brief Returns the name of the given task. */ const char *MSG_task_get_name(msg_task_t task) { - return task->name; + return task->get_cname(); } -/** @brief Sets the name of a #msg_task_t. - * - * This functions allows to associate a name to a task - */ +/** @brief Sets the name of the given task. */ void MSG_task_set_name(msg_task_t task, const char *name) { - task->name = xbt_strdup(name); + task->set_name(name); } -/** @brief Destroy a #msg_task_t. +/** @brief Destroys the given task. * - * Destructor for #msg_task_t. Note that you should free user data, if any, @b before calling this function. + * You should free user data, if any, @b before calling this destructor. * * Only the process that owns the task can destroy it. * The owner changes after a successful send. @@ -176,35 +167,31 @@ void MSG_task_set_name(msg_task_t task, const char *name) */ msg_error_t MSG_task_destroy(msg_task_t task) { - if (task->simdata->isused) { + if (task->is_used) { /* the task is being sent or executed: cancel it first */ MSG_task_cancel(task); } - TRACE_msg_task_destroy(task); - - xbt_free(task->name); /* free main structures */ - delete task->simdata; delete task; return MSG_OK; } -/** @brief Cancel a #msg_task_t. - * @param task the task to cancel. If it was executed or transfered, it stops the process that were working on it. +/** @brief Cancel the given task + * + * If it was currently executed or transfered, the working process is stopped. */ msg_error_t MSG_task_cancel(msg_task_t task) { xbt_assert((task != nullptr), "Cannot cancel a nullptr task"); - simdata_task_t simdata = task->simdata; - if (simdata->compute) { - simcall_execution_cancel(simdata->compute); - } else if (simdata->comm) { - simcall_comm_cancel(simdata->comm); + if (task->compute) { + simgrid::simix::simcall([task] { task->compute->cancel(); }); + } else if (task->comm) { + task->comm->cancel(); } - simdata->setNotUsed(); + task->set_not_used(); return MSG_OK; } @@ -216,12 +203,12 @@ msg_error_t MSG_task_cancel(msg_task_t task) double MSG_task_get_remaining_work_ratio(msg_task_t task) { xbt_assert((task != nullptr), "Cannot get information from a nullptr task"); - if (task->simdata->compute) { + if (task->compute) { // Task in progress - return task->simdata->compute->get_remaining_ratio(); + return task->compute->get_remaining_ratio(); } else { // Task not started (flops_amount is > 0.0) or finished (flops_amount is set to 0.0) - return task->simdata->flops_amount > 0.0 ? 1.0 : 0.0; + return task->flops_amount > 0.0 ? 1.0 : 0.0; } } @@ -233,17 +220,17 @@ double MSG_task_get_remaining_work_ratio(msg_task_t task) { * So you will get an exception if you call this function on parallel tasks. Just don't do it. */ double MSG_task_get_flops_amount(msg_task_t task) { - if (task->simdata->compute != nullptr) { - return task->simdata->compute->get_remaining(); + if (task->compute != nullptr) { + return task->compute->get_remaining(); } else { // Not started or already done. // - Before starting, flops_amount is initially the task cost // - After execution, flops_amount is set to 0 (until someone uses MSG_task_set_flops_amount, if any) - return task->simdata->flops_amount; + return task->flops_amount; } } -/** @brief set the computation amount needed to process a task #msg_task_t. +/** @brief set the computation amount needed to process the given task. * * @warning If the computation is ongoing (already started and not finished), * it is not modified by this call. Moreover, after its completion, the ongoing execution with set the flops_amount to @@ -251,48 +238,48 @@ double MSG_task_get_flops_amount(msg_task_t task) { */ void MSG_task_set_flops_amount(msg_task_t task, double flops_amount) { - task->simdata->flops_amount = flops_amount; + task->flops_amount = flops_amount; } -/** @brief set the amount data attached with a task #msg_task_t. +/** @brief set the amount data attached with the given task. * * @warning If the transfer is ongoing (already started and not finished), it is not modified by this call. */ void MSG_task_set_bytes_amount(msg_task_t task, double data_size) { - task->simdata->bytes_amount = data_size; + task->bytes_amount = data_size; } -/** @brief Returns the total amount received by a task #msg_task_t. - * If the communication does not exist it will return 0. - * So, if the communication has FINISHED or FAILED it returns zero. +/** @brief Returns the total amount received by the given task + * + * If the communication does not exist it will return 0. + * So, if the communication has FINISHED or FAILED it returns zero. */ double MSG_task_get_remaining_communication(msg_task_t task) { - XBT_DEBUG("calling simcall_communication_get_remains(%p)", task->simdata->comm.get()); - return task->simdata->comm->remains(); + XBT_DEBUG("calling simcall_communication_get_remains(%p)", task->comm.get()); + return task->comm->get_remaining(); } -/** @brief Returns the size of the data attached to a task #msg_task_t. - */ +/** @brief Returns the size of the data attached to the given task. */ double MSG_task_get_bytes_amount(msg_task_t task) { - xbt_assert((task != nullptr) && (task->simdata != nullptr), "Invalid parameter"); - return task->simdata->bytes_amount; + xbt_assert(task != nullptr, "Invalid parameter"); + return task->bytes_amount; } -/** @brief Changes the priority of a computation task. This priority doesn't affect the transfer rate. A priority of 2 - * will make a task receive two times more cpu power than the other ones. +/** @brief Changes the priority of a computation task. + * + * This priority doesn't affect the transfer rate. A priority of 2 + * will make a task receive two times more cpu power than regular tasks. */ void MSG_task_set_priority(msg_task_t task, double priority) { - task->simdata->priority = 1 / priority; - if (task->simdata->compute) - simcall_execution_set_priority(task->simdata->compute, task->simdata->priority); + task->priority = 1 / priority; + xbt_assert(std::isfinite(task->priority), "priority is not finite!"); } -/** @brief Changes the maximum CPU utilization of a computation task. - * Unit is flops/s. +/** @brief Changes the maximum CPU utilization of a computation task (in flops/s). * * For VMs, there is a pitfall. Please see MSG_vm_set_bound(). */ @@ -300,8 +287,5 @@ void MSG_task_set_bound(msg_task_t task, double bound) { if (bound < 1e-12) /* close enough to 0 without any floating precision surprise */ XBT_INFO("bound == 0 means no capping (i.e., unlimited)."); - - task->simdata->bound = bound; - if (task->simdata->compute) - simcall_execution_set_bound(task->simdata->compute, task->simdata->bound); + task->bound = bound; }