X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec83ae9a081ffd1d19bfecaf81cb99c32bdf6b83..a2d16cd78c8d1a779948aa69d6e396028c788a5e:/src/simdag/sd_task.cpp diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index e6ee5cfe75..43b1489ead 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2016. The SimGrid Team. +/* Copyright (c) 2006-2020. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -7,6 +7,7 @@ #include "simdag_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/surf_interface.hpp" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)"); @@ -14,7 +15,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)" static void __SD_task_destroy_scheduling_data(SD_task_t task) { if (task->state != SD_SCHEDULED && task->state != SD_RUNNABLE) - THROWF(arg_error, 0, "Task '%s' must be SD_SCHEDULED or SD_RUNNABLE", SD_task_get_name(task)); + throw std::invalid_argument( + simgrid::xbt::string_printf("Task '%s' must be SD_SCHEDULED or SD_RUNNABLE", SD_task_get_name(task))); xbt_free(task->flops_amount); xbt_free(task->bytes_amount); @@ -23,22 +25,22 @@ static void __SD_task_destroy_scheduling_data(SD_task_t task) } /** - * \brief Creates a new task. + * @brief Creates a new task. * - * \param name the name of the task (can be \c nullptr) - * \param data the user data you want to associate with the task (can be \c nullptr) - * \param amount amount of the task - * \return the new task - * \see SD_task_destroy() + * @param name the name of the task (can be @c nullptr) + * @param data the user data you want to associate with the task (can be @c nullptr) + * @param amount amount of the task + * @return the new task + * @see SD_task_destroy() */ SD_task_t SD_task_create(const char *name, void *data, double amount) { SD_task_t task = xbt_new0(s_SD_task_t, 1); task->kind = SD_TASK_NOT_TYPED; task->state= SD_NOT_SCHEDULED; - sd_global->initial_tasks->insert(task); + sd_global->initial_tasks.insert(task); - task->marked = 0; + task->marked = false; task->start_time = -1.0; task->finish_time = -1.0; task->surf_action = nullptr; @@ -65,9 +67,9 @@ static inline SD_task_t SD_task_create_sized(const char *name, void *data, doubl return task; } -/** @brief create a end-to-end communication task that can then be auto-scheduled +/** @brief create an end-to-end communication task that can then be auto-scheduled * - * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows to specify the task costs at + * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows one to specify the task costs at * creation, and decouple them from the scheduling process where you just specify which resource should deliver the * mandatory power. * @@ -85,16 +87,16 @@ SD_task_t SD_task_create_comm_e2e(const char *name, void *data, double amount) /** @brief create a sequential computation task that can then be auto-scheduled * - * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows to specify the task costs at + * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows one to specify the task costs at * creation, and decouple them from the scheduling process where you just specify which resource should deliver the * mandatory power. * * A sequential computation must be scheduled on 1 host, and the amount specified at creation to be run on hosts[0]. * - * \param name the name of the task (can be \c nullptr) - * \param data the user data you want to associate with the task (can be \c nullptr) - * \param flops_amount amount of compute work to be done by the task - * \return the new SD_TASK_COMP_SEQ typed task + * @param name the name of the task (can be @c nullptr) + * @param data the user data you want to associate with the task (can be @c nullptr) + * @param flops_amount amount of compute work to be done by the task + * @return the new SD_TASK_COMP_SEQ typed task */ SD_task_t SD_task_create_comp_seq(const char *name, void *data, double flops_amount) { @@ -107,18 +109,18 @@ SD_task_t SD_task_create_comp_seq(const char *name, void *data, double flops_amo /** @brief create a parallel computation task that can then be auto-scheduled * - * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows to specify the task costs at + * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows one to specify the task costs at * creation, and decouple them from the scheduling process where you just specify which resource should deliver the * mandatory power. * * A parallel computation can be scheduled on any number of host. * The underlying speedup model is Amdahl's law. - * To be auto-scheduled, \see SD_task_distribute_comp_amdahl has to be called first. - * \param name the name of the task (can be \c nullptr) - * \param data the user data you want to associate with the task (can be \c nullptr) - * \param flops_amount amount of compute work to be done by the task - * \param alpha purely serial fraction of the work to be done (in [0.;1.[) - * \return the new task + * To be auto-scheduled, @see SD_task_distribute_comp_amdahl has to be called first. + * @param name the name of the task (can be @c nullptr) + * @param data the user data you want to associate with the task (can be @c nullptr) + * @param flops_amount amount of compute work to be done by the task + * @param alpha purely serial fraction of the work to be done (in [0.;1.[) + * @return the new task */ SD_task_t SD_task_create_comp_par_amdahl(const char *name, void *data, double flops_amount, double alpha) { @@ -133,17 +135,17 @@ SD_task_t SD_task_create_comp_par_amdahl(const char *name, void *data, double fl /** @brief create a complex data redistribution task that can then be auto-scheduled * - * Auto-scheduling mean that the task can be used with SD_task_schedulev(). - * This allows to specify the task costs at creation, and decouple them from the scheduling process where you just + * Auto-scheduling mean that the task can be used with SD_task_schedulev(). + * This allows one to specify the task costs at creation, and decouple them from the scheduling process where you just * specify which resource should communicate. * * A data redistribution can be scheduled on any number of host. - * The assumed distribution is a 1D block distribution. Each host owns the same share of the \see amount. - * To be auto-scheduled, \see SD_task_distribute_comm_mxn_1d_block has to be called first. - * \param name the name of the task (can be \c nullptr) - * \param data the user data you want to associate with the task (can be \c nullptr) - * \param amount amount of data to redistribute by the task - * \return the new task + * The assumed distribution is a 1D block distribution. Each host owns the same share of the @see amount. + * To be auto-scheduled, @see SD_task_distribute_comm_mxn_1d_block has to be called first. + * @param name the name of the task (can be @c nullptr) + * @param data the user data you want to associate with the task (can be @c nullptr) + * @param amount amount of data to redistribute by the task + * @return the new task */ SD_task_t SD_task_create_comm_par_mxn_1d_block(const char *name, void *data, double amount) { @@ -154,26 +156,26 @@ SD_task_t SD_task_create_comm_par_mxn_1d_block(const char *name, void *data, dou } /** - * \brief Destroys a task. + * @brief Destroys a task. * * The user data (if any) should have been destroyed first. * - * \param task the task you want to destroy - * \see SD_task_create() + * @param task the task you want to destroy + * @see SD_task_create() */ void SD_task_destroy(SD_task_t task) { XBT_DEBUG("Destroying task %s...", SD_task_get_name(task)); /* First Remove all dependencies associated with the task. */ - while (!task->predecessors->empty()) + while (not task->predecessors->empty()) SD_task_dependency_remove(*(task->predecessors->begin()), task); - while (!task->inputs->empty()) + while (not task->inputs->empty()) SD_task_dependency_remove(*(task->inputs->begin()), task); - while (!task->successors->empty()) + while (not task->successors->empty()) SD_task_dependency_remove(task, *(task->successors->begin())); - while (!task->outputs->empty()) - SD_task_dependency_remove(task, *(task->outputs->begin())); + while (not task->outputs->empty()) + SD_task_dependency_remove(task, *(task->outputs->begin())); if (task->state == SD_SCHEDULED || task->state == SD_RUNNABLE) __SD_task_destroy_scheduling_data(task); @@ -196,25 +198,25 @@ void SD_task_destroy(SD_task_t task) } /** - * \brief Returns the user data of a task + * @brief Returns the user data of a task * - * \param task a task - * \return the user data associated with this task (can be \c nullptr) - * \see SD_task_set_data() + * @param task a task + * @return the user data associated with this task (can be @c nullptr) + * @see SD_task_set_data() */ -void *SD_task_get_data(SD_task_t task) +void* SD_task_get_data(const_SD_task_t task) { return task->data; } /** - * \brief Sets the user data of a task + * @brief Sets the user data of a task * - * The new data can be \c nullptr. The old data should have been freed first, if it was not \c nullptr. + * The new data can be @c nullptr. The old data should have been freed first, if it was not @c nullptr. * - * \param task a task - * \param data the new data you want to associate with this task - * \see SD_task_get_data() + * @param task a task + * @param data the new data you want to associate with this task + * @see SD_task_get_data() */ void SD_task_set_data(SD_task_t task, void *data) { @@ -222,17 +224,17 @@ void SD_task_set_data(SD_task_t task, void *data) } /** - * \brief Sets the rate of a task + * @brief Sets the rate of a task * * This will change the network bandwidth a task can use. This rate cannot be dynamically changed. Once the task has * started, this call is ineffective. This rate depends on both the nominal bandwidth on the route onto which the task - * is scheduled (\see SD_task_get_current_bandwidth) and the amount of data to transfer. + * is scheduled (@see SD_task_get_current_bandwidth) and the amount of data to transfer. * * To divide the nominal bandwidth by 2, the rate then has to be : * rate = bandwidth/(2*amount) * - * \param task a \see SD_TASK_COMM_E2E task (end-to-end communication) - * \param rate the new rate you want to associate with this task. + * @param task a @see SD_TASK_COMM_E2E task (end-to-end communication) + * @param rate the new rate you want to associate with this task. */ void SD_task_set_rate(SD_task_t task, double rate) { @@ -245,14 +247,14 @@ void SD_task_set_rate(SD_task_t task, double rate) } /** - * \brief Returns the state of a task + * @brief Returns the state of a task * - * \param task a task - * \return the current \ref e_SD_task_state_t "state" of this task: + * @param task a task + * @return the current @ref e_SD_task_state_t "state" of this task: * #SD_NOT_SCHEDULED, #SD_SCHEDULED, #SD_RUNNABLE, #SD_RUNNING, #SD_DONE or #SD_FAILED - * \see e_SD_task_state_t + * @see e_SD_task_state_t */ -e_SD_task_state_t SD_task_get_state(SD_task_t task) +e_SD_task_state_t SD_task_get_state(const_SD_task_t task) { return task->state; } @@ -264,31 +266,31 @@ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) std::set::iterator idx; XBT_DEBUG("Set state of '%s' to %d", task->name, new_state); if ((new_state == SD_NOT_SCHEDULED || new_state == SD_SCHEDULABLE) && task->state == SD_FAILED){ - sd_global->completed_tasks->erase(task); - sd_global->initial_tasks->insert(task); + sd_global->completed_tasks.erase(task); + sd_global->initial_tasks.insert(task); } if (new_state == SD_SCHEDULED && task->state == SD_RUNNABLE){ - sd_global->initial_tasks->insert(task); - sd_global->runnable_tasks->erase(task); + sd_global->initial_tasks.insert(task); + sd_global->runnable_tasks.erase(task); } if (new_state == SD_RUNNABLE){ - idx = sd_global->initial_tasks->find(task); - if (idx != sd_global->initial_tasks->end()) { - sd_global->runnable_tasks->insert(*idx); - sd_global->initial_tasks->erase(idx); + idx = sd_global->initial_tasks.find(task); + if (idx != sd_global->initial_tasks.end()) { + sd_global->runnable_tasks.insert(*idx); + sd_global->initial_tasks.erase(idx); } } if (new_state == SD_RUNNING) - sd_global->runnable_tasks->erase(task); + sd_global->runnable_tasks.erase(task); if (new_state == SD_DONE || new_state == SD_FAILED){ - sd_global->completed_tasks->insert(task); - task->start_time = task->surf_action->getStartTime(); + sd_global->completed_tasks.insert(task); + task->start_time = task->surf_action->get_start_time(); if (new_state == SD_DONE){ - task->finish_time = task->surf_action->getFinishTime(); + task->finish_time = task->surf_action->get_finish_time(); #if SIMGRID_HAVE_JEDULE jedule_log_sd_event(task); #endif @@ -309,12 +311,12 @@ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) } /** - * \brief Returns the name of a task + * @brief Returns the name of a task * - * \param task a task - * \return the name of this task (can be \c nullptr) + * @param task a task + * @return the name of this task (can be @c nullptr) */ -const char *SD_task_get_name(SD_task_t task) +const char* SD_task_get_name(const_SD_task_t task) { return task->name; } @@ -328,17 +330,17 @@ void SD_task_set_name(SD_task_t task, const char *name) /** @brief Returns the dynar of the parents of a task * - * \param task a task - * \return a newly allocated dynar comprising the parents of this task + * @param task a task + * @return a newly allocated dynar comprising the parents of this task */ -xbt_dynar_t SD_task_get_parents(SD_task_t task) +xbt_dynar_t SD_task_get_parents(const_SD_task_t task) { xbt_dynar_t parents = xbt_dynar_new(sizeof(SD_task_t), nullptr); - for (auto it : *task->predecessors) + for (auto const& it : *task->predecessors) xbt_dynar_push(parents, &it); - for (auto it : *task->inputs) + for (auto const& it : *task->inputs) xbt_dynar_push(parents, &it); return parents; @@ -346,51 +348,51 @@ xbt_dynar_t SD_task_get_parents(SD_task_t task) /** @brief Returns the dynar of the parents of a task * - * \param task a task - * \return a newly allocated dynar comprising the parents of this task + * @param task a task + * @return a newly allocated dynar comprising the parents of this task */ -xbt_dynar_t SD_task_get_children(SD_task_t task) +xbt_dynar_t SD_task_get_children(const_SD_task_t task) { xbt_dynar_t children = xbt_dynar_new(sizeof(SD_task_t), nullptr); - for (auto it : *task->successors) + for (auto const& it : *task->successors) xbt_dynar_push(children, &it); - for (auto it : *task->outputs) + for (auto const& it : *task->outputs) xbt_dynar_push(children, &it); return children; } /** - * \brief Returns the number of workstations involved in a task + * @brief Returns the number of workstations involved in a task * * Only call this on already scheduled tasks! - * \param task a task + * @param task a task */ -int SD_task_get_workstation_count(SD_task_t task) +int SD_task_get_workstation_count(const_SD_task_t task) { - return task->allocation->size(); + return static_cast(task->allocation->size()); } /** - * \brief Returns the list of workstations involved in a task + * @brief Returns the list of workstations involved in a task * * Only call this on already scheduled tasks! - * \param task a task + * @param task a task */ -sg_host_t *SD_task_get_workstation_list(SD_task_t task) +sg_host_t* SD_task_get_workstation_list(const_SD_task_t task) { - return &(*(task->allocation))[0]; + return task->allocation->data(); } /** - * \brief Returns the total amount of work contained in a task + * @brief Returns the total amount of work contained in a task * - * \param task a task - * \return the total amount of work (computation or data transfer) for this task - * \see SD_task_get_remaining_amount() + * @param task a task + * @return the total amount of work (computation or data transfer) for this task + * @see SD_task_get_remaining_amount() */ -double SD_task_get_amount(SD_task_t task) +double SD_task_get_amount(const_SD_task_t task) { return task->amount; } @@ -400,8 +402,8 @@ double SD_task_get_amount(SD_task_t task) * bytes_amount arrays respectively. Nothing more than modifying task->amount is done for parallel typed tasks * (COMP_PAR_AMDAHL and COMM_PAR_MXN_1D_BLOCK) as the distribution of the amount of work is done at scheduling time. * - * \param task a task - * \param amount the new amount of work to execute + * @param task a task + * @param amount the new amount of work to execute */ void SD_task_set_amount(SD_task_t task, double amount) { @@ -413,39 +415,39 @@ void SD_task_set_amount(SD_task_t task, double amount) } /** - * \brief Returns the alpha parameter of a SD_TASK_COMP_PAR_AMDAHL task + * @brief Returns the alpha parameter of a SD_TASK_COMP_PAR_AMDAHL task * - * \param task a parallel task assuming Amdahl's law as speedup model - * \return the alpha parameter (serial part of a task in percent) for this task + * @param task a parallel task assuming Amdahl's law as speedup model + * @return the alpha parameter (serial part of a task in percent) for this task */ -double SD_task_get_alpha(SD_task_t task) +double SD_task_get_alpha(const_SD_task_t task) { xbt_assert(SD_task_get_kind(task) == SD_TASK_COMP_PAR_AMDAHL, "Alpha parameter is not defined for this kind of task"); return task->alpha; } /** - * \brief Returns the remaining amount work to do till the completion of a task + * @brief Returns the remaining amount work to do till the completion of a task * - * \param task a task - * \return the remaining amount of work (computation or data transfer) of this task - * \see SD_task_get_amount() + * @param task a task + * @return the remaining amount of work (computation or data transfer) of this task + * @see SD_task_get_amount() */ -double SD_task_get_remaining_amount(SD_task_t task) +double SD_task_get_remaining_amount(const_SD_task_t task) { if (task->surf_action) - return task->surf_action->getRemains(); + return task->surf_action->get_remains(); else return (task->state == SD_DONE) ? 0 : task->amount; } -e_SD_task_kind_t SD_task_get_kind(SD_task_t task) +e_SD_task_kind_t SD_task_get_kind(const_SD_task_t task) { return task->kind; } /** @brief Displays debugging information about a task */ -void SD_task_dump(SD_task_t task) +void SD_task_dump(const_SD_task_t task) { XBT_INFO("Displaying task %s", SD_task_get_name(task)); if (task->state == SD_RUNNABLE) @@ -480,26 +482,26 @@ void SD_task_dump(SD_task_t task) XBT_INFO(" - Dependencies to satisfy: %zu", task->inputs->size()+ task->predecessors->size()); if ((task->inputs->size()+ task->predecessors->size()) > 0) { XBT_INFO(" - pre-dependencies:"); - for (auto it : *task->predecessors) + for (auto const& it : *task->predecessors) XBT_INFO(" %s", it->name); - for (auto it: *task->inputs) + for (auto const& it : *task->inputs) XBT_INFO(" %s", it->name); } if ((task->outputs->size() + task->successors->size()) > 0) { XBT_INFO(" - post-dependencies:"); - for (auto it : *task->successors) + for (auto const& it : *task->successors) XBT_INFO(" %s", it->name); - for (auto it : *task->outputs) + for (auto const& it : *task->outputs) XBT_INFO(" %s", it->name); } } /** @brief Dumps the task in dotty formalism into the FILE* passed as second argument */ -void SD_task_dotty(SD_task_t task, void *out) +void SD_task_dotty(const_SD_task_t task, void* out) { - FILE *fout = static_cast(out); + auto* fout = static_cast(out); fprintf(fout, " T%p [label=\"%.20s\"", task, task->name); switch (task->kind) { case SD_TASK_COMM_E2E: @@ -514,40 +516,40 @@ void SD_task_dotty(SD_task_t task, void *out) xbt_die("Unknown task type!"); } fprintf(fout, "];\n"); - for (auto it : *task->predecessors) + for (auto const& it : *task->predecessors) fprintf(fout, " T%p -> T%p;\n", it, task); - for (auto it : *task->inputs) + for (auto const& it : *task->inputs) fprintf(fout, " T%p -> T%p;\n", it, task); } /** - * \brief Adds a dependency between two tasks + * @brief Adds a dependency between two tasks * - * \a dst will depend on \a src, ie \a dst will not start before \a src is finished. - * Their \ref e_SD_task_state_t "state" must be #SD_NOT_SCHEDULED, #SD_SCHEDULED or #SD_RUNNABLE. + * @a dst will depend on @a src, ie @a dst will not start before @a src is finished. + * Their @ref e_SD_task_state_t "state" must be #SD_NOT_SCHEDULED, #SD_SCHEDULED or #SD_RUNNABLE. * - * \param name the name of the new dependency (can be \c nullptr) - * \param data the user data you want to associate with this dependency (can be \c nullptr) - * \param src the task which must be executed first - * \param dst the task you want to make depend on \a src - * \see SD_task_dependency_remove() + * @param src the task which must be executed first + * @param dst the task you want to make depend on @a src + * @see SD_task_dependency_remove() */ -void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task_t dst) +void SD_task_dependency_add(SD_task_t src, SD_task_t dst) { if (src == dst) - THROWF(arg_error, 0, "Cannot add a dependency between task '%s' and itself", SD_task_get_name(src)); + throw std::invalid_argument( + simgrid::xbt::string_printf("Cannot add a dependency between task '%s' and itself", SD_task_get_name(src))); if (src->state == SD_DONE || src->state == SD_FAILED) - THROWF(arg_error, 0, "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, SD_RUNNABLE, or SD_RUNNING", - src->name); + throw std::invalid_argument(simgrid::xbt::string_printf( + "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, SD_RUNNABLE, or SD_RUNNING", src->name)); if (dst->state == SD_DONE || dst->state == SD_FAILED || dst->state == SD_RUNNING) - THROWF(arg_error, 0, "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, or SD_RUNNABLE", - dst->name); + throw std::invalid_argument(simgrid::xbt::string_printf( + "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED, or SD_RUNNABLE", dst->name)); if (dst->inputs->find(src) != dst->inputs->end() || src->outputs->find(dst) != src->outputs->end() || src->successors->find(dst) != src->successors->end() || dst->predecessors->find(src) != dst->predecessors->end()) - THROWF(arg_error, 0, "A dependency already exists between task '%s' and task '%s'", src->name, dst->name); + throw std::invalid_argument(simgrid::xbt::string_printf( + "A dependency already exists between task '%s' and task '%s'", src->name, dst->name)); XBT_DEBUG("SD_task_dependency_add: src = %s, dst = %s", src->name, dst->name); @@ -573,15 +575,15 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task } /** - * \brief Indicates whether there is a dependency between two tasks. + * @brief Indicates whether there is a dependency between two tasks. * - * \param src a task - * \param dst a task depending on \a src + * @param src a task + * @param dst a task depending on @a src * * If src is nullptr, checks whether dst has any pre-dependency. * If dst is nullptr, checks whether src has any post-dependency. */ -int SD_task_dependency_exists(SD_task_t src, SD_task_t dst) +int SD_task_dependency_exists(const_SD_task_t src, SD_task_t dst) { xbt_assert(src != nullptr || dst != nullptr, "Invalid parameter: both src and dst are nullptr"); @@ -589,28 +591,28 @@ int SD_task_dependency_exists(SD_task_t src, SD_task_t dst) if (dst) { return (src->successors->find(dst) != src->successors->end() || src->outputs->find(dst) != src->outputs->end()); } else { - return src->successors->size() + src->outputs->size(); + return static_cast(src->successors->size() + src->outputs->size()); } } else { - return dst->predecessors->size() + dst->inputs->size(); + return static_cast(dst->predecessors->size() + dst->inputs->size()); } - return 0; } /** - * \brief Remove a dependency between two tasks + * @brief Remove a dependency between two tasks * - * \param src a task - * \param dst a task depending on \a src - * \see SD_task_dependency_add() + * @param src a task + * @param dst a task depending on @a src + * @see SD_task_dependency_add() */ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst) { XBT_DEBUG("SD_task_dependency_remove: src = %s, dst = %s", SD_task_get_name(src), SD_task_get_name(dst)); if (src->successors->find(dst) == src->successors->end() && src->outputs->find(dst) == src->outputs->end()) - THROWF(arg_error, 0, "No dependency found between task '%s' and '%s': task '%s' is not a successor of task '%s'", - src->name, dst->name, dst->name, src->name); + throw std::invalid_argument(simgrid::xbt::string_printf( + "No dependency found between task '%s' and '%s': task '%s' is not a successor of task '%s'", src->name, + dst->name, dst->name, src->name)); if (src->kind == SD_TASK_COMM_E2E || src->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ if (dst->kind == SD_TASK_COMP_SEQ || dst->kind == SD_TASK_COMP_PAR_AMDAHL) @@ -632,29 +634,29 @@ void SD_task_dependency_remove(SD_task_t src, SD_task_t dst) } /** - * \brief Adds a watch point to a task + * @brief Adds a watch point to a task * - * SD_simulate() will stop as soon as the \ref e_SD_task_state_t "state" of this task becomes the one given in argument. + * SD_simulate() will stop as soon as the @ref e_SD_task_state_t "state" of this task becomes the one given in argument. * The watch point is then automatically removed. * - * \param task a task - * \param state the \ref e_SD_task_state_t "state" you want to watch (cannot be #SD_NOT_SCHEDULED) - * \see SD_task_unwatch() + * @param task a task + * @param state the @ref e_SD_task_state_t "state" you want to watch (cannot be #SD_NOT_SCHEDULED) + * @see SD_task_unwatch() */ void SD_task_watch(SD_task_t task, e_SD_task_state_t state) { if (state & SD_NOT_SCHEDULED) - THROWF(arg_error, 0, "Cannot add a watch point for state SD_NOT_SCHEDULED"); + throw std::invalid_argument("Cannot add a watch point for state SD_NOT_SCHEDULED"); task->watch_points = task->watch_points | state; } /** - * \brief Removes a watch point from a task + * @brief Removes a watch point from a task * - * \param task a task - * \param state the \ref e_SD_task_state_t "state" you no longer want to watch - * \see SD_task_watch() + * @param task a task + * @param state the @ref e_SD_task_state_t "state" you no longer want to watch + * @see SD_task_watch() */ void SD_task_unwatch(SD_task_t task, e_SD_task_state_t state) { @@ -663,20 +665,19 @@ void SD_task_unwatch(SD_task_t task, e_SD_task_state_t state) } /** - * \brief Returns an approximative estimation of the execution time of a task. + * @brief Returns an approximative estimation of the execution time of a task. * * The estimation is very approximative because the value returned is the time the task would take if it was executed * now and if it was the only task. * - * \param task the task to evaluate - * \param host_count number of hosts on which the task would be executed - * \param host_list the hosts on which the task would be executed - * \param flops_amount computation amount for each host(i.e., an array of host_count doubles) - * \param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles) - * \see SD_schedule() + * @param host_count number of hosts on which the task would be executed + * @param host_list the hosts on which the task would be executed + * @param flops_amount computation amount for each host(i.e., an array of host_count doubles) + * @param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles) + * @see SD_schedule() */ -double SD_task_get_execution_time(SD_task_t task, int host_count, const sg_host_t *host_list, - const double *flops_amount, const double *bytes_amount) +double SD_task_get_execution_time(const_SD_task_t /*task*/, int host_count, const sg_host_t* host_list, + const double* flops_amount, const double* bytes_amount) { xbt_assert(host_count > 0, "Invalid parameter"); double max_time = 0.0; @@ -685,13 +686,13 @@ double SD_task_get_execution_time(SD_task_t task, int host_count, const sg_host_ for (int i = 0; i < host_count; i++) { double time = 0.0; if (flops_amount != nullptr) - time = flops_amount[i] / host_list[i]->speed(); + time = flops_amount[i] / host_list[i]->get_speed(); if (bytes_amount != nullptr) for (int j = 0; j < host_count; j++) if (bytes_amount[i * host_count + j] != 0) - time += (sg_host_route_latency(host_list[i], host_list[j]) + - bytes_amount[i * host_count + j] / sg_host_route_bandwidth(host_list[i], host_list[j])); + time += (sg_host_get_route_latency(host_list[i], host_list[j]) + + bytes_amount[i * host_count + j] / sg_host_get_route_bandwidth(host_list[i], host_list[j])); if (time > max_time) max_time = time; @@ -702,7 +703,8 @@ double SD_task_get_execution_time(SD_task_t task, int host_count, const sg_host_ static inline void SD_task_do_schedule(SD_task_t task) { if (SD_task_get_state(task) > SD_SCHEDULABLE) - THROWF(arg_error, 0, "Task '%s' has already been scheduled", SD_task_get_name(task)); + throw std::invalid_argument( + simgrid::xbt::string_printf("Task '%s' has already been scheduled", SD_task_get_name(task))); if (task->predecessors->empty() && task->inputs->empty()) SD_task_set_state(task, SD_RUNNABLE); @@ -711,18 +713,18 @@ static inline void SD_task_do_schedule(SD_task_t task) } /** - * \brief Schedules a task + * @brief Schedules a task * * The task state must be #SD_NOT_SCHEDULED. - * Once scheduled, a task is executed as soon as possible in \see SD_simulate, i.e. when its dependencies are satisfied. + * Once scheduled, a task is executed as soon as possible in @see SD_simulate, i.e. when its dependencies are satisfied. * - * \param task the task you want to schedule - * \param host_count number of hosts on which the task will be executed - * \param host_list the hosts on which the task will be executed - * \param flops_amount computation amount for each hosts (i.e., an array of host_count doubles) - * \param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles) - * \param rate task execution speed rate - * \see SD_task_unschedule() + * @param task the task you want to schedule + * @param host_count number of hosts on which the task will be executed + * @param host_list the hosts on which the task will be executed + * @param flops_amount computation amount for each hosts (i.e., an array of host_count doubles) + * @param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles) + * @param rate task execution speed rate + * @see SD_task_unschedule() */ void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * host_list, const double *flops_amount, const double *bytes_amount, double rate) @@ -755,25 +757,27 @@ void SD_task_schedule(SD_task_t task, int host_count, const sg_host_t * host_lis } /** - * \brief Unschedules a task + * @brief Unschedules a task * * The task state must be #SD_SCHEDULED, #SD_RUNNABLE, #SD_RUNNING or #SD_FAILED. * If you call this function, the task state becomes #SD_NOT_SCHEDULED. * Call SD_task_schedule() to schedule it again. * - * \param task the task you want to unschedule - * \see SD_task_schedule() + * @param task the task you want to unschedule + * @see SD_task_schedule() */ void SD_task_unschedule(SD_task_t task) { if (task->state == SD_NOT_SCHEDULED || task->state == SD_SCHEDULABLE) - THROWF(arg_error, 0, "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED", task->name); + throw std::invalid_argument(simgrid::xbt::string_printf( + "Task %s: the state must be SD_SCHEDULED, SD_RUNNABLE, SD_RUNNING or SD_FAILED", task->name)); - if ((task->state == SD_SCHEDULED || task->state == SD_RUNNABLE) /* if the task is scheduled or runnable */ - && ((task->kind == SD_TASK_COMP_PAR_AMDAHL) || (task->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK))) { - /* Don't free scheduling data for typed tasks */ - __SD_task_destroy_scheduling_data(task); + if (task->state == SD_SCHEDULED || task->state == SD_RUNNABLE) /* if the task is scheduled or runnable */ { task->allocation->clear(); + if (task->kind == SD_TASK_COMP_PAR_AMDAHL || task->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK) { + /* Don't free scheduling data for typed tasks */ + __SD_task_destroy_scheduling_data(task); + } } if (SD_task_get_state(task) == SD_RUNNING) @@ -796,64 +800,48 @@ void SD_task_run(SD_task_t task) XBT_VERB("Executing task '%s'", task->name); - /* Copy the elements of the task into the action */ - int host_nb = task->allocation->size(); - sg_host_t *hosts = xbt_new(sg_host_t, host_nb); - int i =0; - for (auto host: *task->allocation){ - hosts[i] = host; - i++; - } - - double *flops_amount = xbt_new0(double, host_nb); - double *bytes_amount = xbt_new0(double, host_nb * host_nb); - - if(task->flops_amount) - memcpy(flops_amount, task->flops_amount, sizeof(double) * host_nb); - if(task->bytes_amount) - memcpy(bytes_amount, task->bytes_amount, sizeof(double) * host_nb * host_nb); - - task->surf_action = surf_host_model->executeParallelTask(host_nb, hosts, flops_amount, bytes_amount, task->rate); + /* Beware! The scheduling data are now used by the surf action directly! no copy was done */ + task->surf_action = + surf_host_model->execute_parallel(*task->allocation, task->flops_amount, task->bytes_amount, task->rate); - task->surf_action->setData(task); + task->surf_action->set_data(task); XBT_DEBUG("surf_action = %p", task->surf_action); - __SD_task_destroy_scheduling_data(task); /* now the scheduling data are not useful anymore */ SD_task_set_state(task, SD_RUNNING); - sd_global->return_set->insert(task); + sd_global->return_set.insert(task); } /** - * \brief Returns the start time of a task + * @brief Returns the start time of a task * * The task state must be SD_RUNNING, SD_DONE or SD_FAILED. * - * \param task: a task - * \return the start time of this task + * @param task: a task + * @return the start time of this task */ -double SD_task_get_start_time(SD_task_t task) +double SD_task_get_start_time(const_SD_task_t task) { if (task->surf_action) - return task->surf_action->getStartTime(); + return task->surf_action->get_start_time(); else return task->start_time; } /** - * \brief Returns the finish time of a task + * @brief Returns the finish time of a task * * The task state must be SD_RUNNING, SD_DONE or SD_FAILED. * If the state is not completed yet, the returned value is an estimation of the task finish time. This value can * vary until the task is completed. * - * \param task: a task - * \return the start time of this task + * @param task: a task + * @return the start time of this task */ -double SD_task_get_finish_time(SD_task_t task) +double SD_task_get_finish_time(const_SD_task_t task) { if (task->surf_action) /* should never happen as actions are destroyed right after their completion */ - return task->surf_action->getFinishTime(); + return task->surf_action->get_finish_time(); else return task->finish_time; } @@ -885,7 +873,8 @@ void SD_task_build_MxN_1D_block_matrix(SD_task_t task, int src_nb, int dst_nb){ XBT_VERB("(%d->%d): (%.2f, %.2f)-> (%.2f, %.2f)", i, j, src_start, src_end, dst_start, dst_end); task->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0; if ((src_end > dst_start) && (dst_end > src_start)) { /* There is something to send */ - task->bytes_amount[i*(src_nb+dst_nb)+src_nb+j] = MIN(src_end, dst_end)- MAX(src_start, dst_start); + task->bytes_amount[i * (src_nb + dst_nb) + src_nb + j] = + std::min(src_end, dst_end) - std::max(src_start, dst_start); XBT_VERB("==> %.2f", task->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]); } } @@ -894,7 +883,7 @@ void SD_task_build_MxN_1D_block_matrix(SD_task_t task, int src_nb, int dst_nb){ /** @brief Auto-schedules a task. * - * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows to specify the task costs at + * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows one to specify the task costs at * creation, and decouple them from the scheduling process where you just specify which resource should deliver the * mandatory power. * @@ -911,7 +900,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) XBT_VERB("Schedule computation task %s on %zu host(s)", task->name, task->allocation->size()); if (task->kind == SD_TASK_COMP_SEQ) { - if (!task->flops_amount){ /*This task has failed and is rescheduled. Reset the flops_amount*/ + if (not task->flops_amount) { /*This task has failed and is rescheduled. Reset the flops_amount*/ task->flops_amount = xbt_new0(double, 1); task->flops_amount[0] = task->amount; } @@ -926,8 +915,8 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) SD_task_do_schedule(task); /* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */ - for (auto input : *task->inputs){ - int src_nb = input->allocation->size(); + for (auto const& input : *task->inputs) { + int src_nb = static_cast(input->allocation->size()); int dst_nb = count; if (input->allocation->empty()) XBT_VERB("Sender side of '%s' not scheduled. Set receiver side to '%s''s allocation", input->name, task->name); @@ -945,9 +934,9 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) } } - for (auto output : *task->outputs){ + for (auto const& output : *task->outputs) { int src_nb = count; - int dst_nb = output->allocation->size(); + int dst_nb = static_cast(output->allocation->size()); if (output->allocation->empty()) XBT_VERB("Receiver side of '%s' not scheduled. Set sender side to '%s''s allocation", output->name, task->name); @@ -973,12 +962,12 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) void SD_task_schedulel(SD_task_t task, int count, ...) { va_list ap; - sg_host_t *list = xbt_new(sg_host_t, count); + auto* list = new sg_host_t[count]; va_start(ap, count); for (int i=0; i