-/* Copyright (c) 2006-2019. 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
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);
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;
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.
*
/** @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.
*
/** @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.
*
/** @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
+ * 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.
* @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;
}
* #SD_NOT_SCHEDULED, #SD_SCHEDULED, #SD_RUNNABLE, #SD_RUNNING, #SD_DONE or #SD_FAILED
* @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;
}
std::set<SD_task_t>::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);
+ 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->get_finish_time();
* @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;
}
* @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);
* @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);
* Only call this on already scheduled tasks!
* @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<int>(task->allocation->size());
}
/**
* Only call this on already scheduled tasks!
* @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->data();
}
* @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;
}
* @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;
* @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->get_remains();
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)
}
/** @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<FILE*>(out);
+ auto* fout = static_cast<FILE*>(out);
fprintf(fout, " T%p [label=\"%.20s\"", task, task->name);
switch (task->kind) {
case SD_TASK_COMM_E2E:
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);
* 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");
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<int>(src->successors->size() + src->outputs->size());
}
} else {
- return dst->predecessors->size() + dst->inputs->size();
+ return static_cast<int>(dst->predecessors->size() + dst->inputs->size());
}
}
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)
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;
}
* @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,
+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");
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;
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);
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)
XBT_VERB("Executing task '%s'", task->name);
/* 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->size(), task->allocation->data(),
- task->flops_amount, task->bytes_amount, task->rate);
+ task->surf_action =
+ surf_host_model->execute_parallel(*task->allocation, task->flops_amount, task->bytes_amount, task->rate);
task->surf_action->set_data(task);
XBT_DEBUG("surf_action = %p", task->surf_action);
SD_task_set_state(task, SD_RUNNING);
- sd_global->return_set->insert(task);
+ sd_global->return_set.insert(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->get_start_time();
* @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->get_finish_time();
/** @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.
*
/* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */
for (auto const& input : *task->inputs) {
- int src_nb = input->allocation->size();
+ int src_nb = static_cast<int>(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);
for (auto const& output : *task->outputs) {
int src_nb = count;
- int dst_nb = output->allocation->size();
+ int dst_nb = static_cast<int>(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);
void SD_task_schedulel(SD_task_t task, int count, ...)
{
va_list ap;
- sg_host_t* list = new sg_host_t[count];
+ auto* list = new sg_host_t[count];
va_start(ap, count);
for (int i=0; i<count; i++)
list[i] = va_arg(ap, sg_host_t);
