/* 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. */
+#include "src/surf/HostImpl.hpp"
#include "src/surf/surf_interface.hpp"
-#include "src/surf/host_interface.hpp"
#include "src/simdag/simdag_private.h"
#include "simgrid/simdag.h"
-#include "xbt/sysdep.h"
-#include "xbt/dynar.h"
#include "src/instr/instr_private.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)");
-static void __SD_task_remove_dependencies(SD_task_t task);
-static void __SD_task_destroy_scheduling_data(SD_task_t task);
+/* Destroys a dependency between two tasks. */
+static void __SD_task_dependency_destroy(void *dependency)
+{
+ xbt_free(((SD_dependency_t)dependency)->name);
+ xbt_free(dependency);
+}
+
+/* Remove all dependencies associated with a task. This function is called when the task is destroyed. */
+static void __SD_task_remove_dependencies(SD_task_t task)
+{
+ /* we must destroy the dependencies carefully (with SD_dependency_remove) because each one is stored twice */
+ SD_dependency_t dependency;
+ while (xbt_dynar_is_empty(task->tasks_before) == 0) {
+ xbt_dynar_get_cpy(task->tasks_before, 0, &dependency);
+ SD_task_dependency_remove(dependency->src, dependency->dst);
+ }
+
+ while (xbt_dynar_is_empty(task->tasks_after) == 0) {
+ xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
+ SD_task_dependency_remove(dependency->src, dependency->dst);
+ }
+}
-void* SD_task_new_f(void)
+/* Destroys the data memorized by SD_task_schedule. Task state must be SD_SCHEDULED or SD_RUNNABLE. */
+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));
+
+ xbt_free(task->flops_amount);
+ xbt_free(task->bytes_amount);
+ task->flops_amount = nullptr;
+ task->bytes_amount = nullptr;
+}
+
+void* SD_task_new_f()
{
SD_task_t task = xbt_new0(s_SD_task_t, 1);
- task->tasks_before = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
- task->tasks_after = xbt_dynar_new(sizeof(SD_dependency_t), NULL);
+ task->tasks_before = xbt_dynar_new(sizeof(SD_dependency_t), nullptr);
+ task->tasks_after = xbt_dynar_new(sizeof(SD_dependency_t), nullptr);
return task;
}
void SD_task_recycle_f(void *t)
{
- SD_task_t task = (SD_task_t) t;
+ SD_task_t task = static_cast<SD_task_t>(t);
/* Reset the content */
task->kind = SD_TASK_NOT_TYPED;
task->state= SD_NOT_SCHEDULED;
- xbt_dynar_push(sd_global->initial_task_set,&task);
+ sd_global->initial_tasks->insert(task);
task->marked = 0;
task->start_time = -1.0;
task->finish_time = -1.0;
- task->surf_action = NULL;
+ task->surf_action = nullptr;
task->watch_points = 0;
/* dependencies */
/* scheduling parameters */
task->host_count = 0;
- task->host_list = NULL;
- task->flops_amount = NULL;
- task->bytes_amount = NULL;
+ task->host_list = nullptr;
+ task->flops_amount = nullptr;
+ task->bytes_amount = nullptr;
task->rate = -1;
}
void SD_task_free_f(void *t)
{
- SD_task_t task = (SD_task_t)t;
+ SD_task_t task = static_cast<SD_task_t>(t);
xbt_dynar_free(&task->tasks_before);
xbt_dynar_free(&task->tasks_after);
/**
* \brief Creates a new task.
*
- * \param name the name of the task (can be \c NULL)
- * \param data the user data you want to associate with the task (can be \c NULL)
+ * \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 = (SD_task_t)xbt_mallocator_get(sd_global->task_mallocator);
+ SD_task_t task = static_cast<SD_task_t>(xbt_mallocator_get(sd_global->task_mallocator));
/* general information */
task->data = data; /* user data */
return task;
}
-static XBT_INLINE SD_task_t SD_task_create_sized(const char *name, void *data, double amount, int ws_count)
+static inline SD_task_t SD_task_create_sized(const char *name, void *data, double amount, int ws_count)
{
SD_task_t task = SD_task_create(name, data, amount);
task->bytes_amount = xbt_new0(double, ws_count * ws_count);
*
* 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 NULL)
- * \param data the user data you want to associate with the task (can be \c NULL)
+ * \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
*/
* 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 NULL)
- * \param data the user data you want to associate with the task (can be \c NULL)
+ * \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
* 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 NULL)
- * \param data the user data you want to associate with the task (can be \c NULL)
+ * \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)
{
SD_task_t res = SD_task_create(name, data, amount);
- res->host_list=NULL;
+ res->host_list=nullptr;
res->kind = SD_TASK_COMM_PAR_MXN_1D_BLOCK;
return res;
int idx = xbt_dynar_search_or_negative(sd_global->return_set, &task);
if (idx >=0) {
- xbt_dynar_remove_at(sd_global->return_set, idx, NULL);
+ xbt_dynar_remove_at(sd_global->return_set, idx, nullptr);
}
xbt_free(task->name);
- if (task->surf_action != NULL)
+ if (task->surf_action != nullptr)
task->surf_action->unref();
xbt_free(task->host_list);
* \brief Returns the user data of a task
*
* \param task a task
- * \return the user data associated with this task (can be \c NULL)
+ * \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)
/**
* \brief Sets the user data of a task
*
- * The new data can be \c NULL. The old data should have been freed first
- * if it was not \c NULL.
+ * 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
*/
void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state)
{
- int idx;
+ std::set<SD_task_t>::iterator idx;
switch (new_state) {
case SD_NOT_SCHEDULED:
case SD_SCHEDULABLE:
if (SD_task_get_state(task) == SD_FAILED){
- xbt_dynar_remove_at(sd_global->completed_task_set,
- xbt_dynar_search(sd_global->completed_task_set, &task), NULL);
- xbt_dynar_push(sd_global->initial_task_set,&task);
+ sd_global->completed_tasks->erase(task);
+ sd_global->initial_tasks->insert(task);
}
break;
case SD_SCHEDULED:
if (SD_task_get_state(task) == SD_RUNNABLE){
- xbt_dynar_remove_at(sd_global->executable_task_set,
- xbt_dynar_search(sd_global->executable_task_set, &task), NULL);
- xbt_dynar_push(sd_global->initial_task_set,&task);
+ sd_global->executable_tasks->erase(task);
+ sd_global->initial_tasks->insert(task);
}
break;
case SD_RUNNABLE:
- idx = xbt_dynar_search_or_negative(sd_global->initial_task_set, &task);
- if (idx >= 0) {
- xbt_dynar_remove_at(sd_global->initial_task_set, idx, NULL);
- xbt_dynar_push(sd_global->executable_task_set,&task);
+ idx = std::find(sd_global->initial_tasks->begin(), sd_global->initial_tasks->end(), task);
+ if (idx != sd_global->initial_tasks->end()) {
+ sd_global->initial_tasks->erase(idx);
+ sd_global->executable_tasks->insert(*idx);
}
break;
case SD_RUNNING:
- xbt_dynar_remove_at(sd_global->executable_task_set,
- xbt_dynar_search(sd_global->executable_task_set, &task), NULL);
+ sd_global->executable_tasks->erase(task);
break;
case SD_DONE:
- xbt_dynar_push(sd_global->completed_task_set,&task);
+ sd_global->completed_tasks->insert(task);
task->finish_time = task->surf_action->getFinishTime();
task->remains = 0;
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
jedule_log_sd_event(task);
#endif
break;
case SD_FAILED:
- xbt_dynar_push(sd_global->completed_task_set,&task);
+ sd_global->completed_tasks->insert(task);
break;
default:
xbt_die( "Invalid state");
* \brief Returns the name of a task
*
* \param task a task
- * \return the name of this task (can be \c NULL)
+ * \return the name of this task (can be \c nullptr)
*/
const char *SD_task_get_name(SD_task_t task)
{
unsigned int i;
SD_dependency_t dep;
- xbt_dynar_t parents = xbt_dynar_new(sizeof(SD_task_t), NULL);
+ xbt_dynar_t parents = xbt_dynar_new(sizeof(SD_task_t), nullptr);
xbt_dynar_foreach(task->tasks_before, i, dep) {
xbt_dynar_push(parents, &(dep->src));
}
unsigned int i;
SD_dependency_t dep;
- xbt_dynar_t children = xbt_dynar_new(sizeof(SD_task_t), NULL);
+ xbt_dynar_t children = xbt_dynar_new(sizeof(SD_task_t), nullptr);
xbt_dynar_foreach(task->tasks_after, i, dep) {
xbt_dynar_push(children, &(dep->dst));
}
}
/**
- * \brief Returns the amount 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
return task->alpha;
}
-
/**
* \brief Returns the remaining amount work to do till the completion of a task
*
return task->kind;
}
-/** @brief Displays debugging informations about a task */
+/** @brief Displays debugging information about a task */
void SD_task_dump(SD_task_t task)
{
unsigned int counter;
if (task->kind == SD_TASK_COMP_PAR_AMDAHL)
XBT_INFO(" - alpha: %.2f", task->alpha);
XBT_INFO(" - Dependencies to satisfy: %d", task->unsatisfied_dependencies);
- if (!xbt_dynar_is_empty(task->tasks_before)) {
+ if (xbt_dynar_is_empty(task->tasks_before) == 0) {
XBT_INFO(" - pre-dependencies:");
xbt_dynar_foreach(task->tasks_before, counter, dependency) {
XBT_INFO(" %s", SD_task_get_name(dependency->src));
}
}
- if (!xbt_dynar_is_empty(task->tasks_after)) {
+ if (xbt_dynar_is_empty(task->tasks_after)== 0) {
XBT_INFO(" - post-dependencies:");
xbt_dynar_foreach(task->tasks_after, counter, dependency) {
XBT_INFO(" %s", SD_task_get_name(dependency->dst));
{
unsigned int counter;
SD_dependency_t dependency;
- FILE *fout = (FILE*)out;
+ FILE *fout = static_cast<FILE*>(out);
fprintf(fout, " T%p [label=\"%.20s\"", task, task->name);
switch (task->kind) {
case SD_TASK_COMM_E2E:
}
}
-/* Destroys a dependency between two tasks.
- */
-static void __SD_task_dependency_destroy(void *dependency)
-{
- xbt_free(((SD_dependency_t)dependency)->name);
- xbt_free(dependency);
-}
-
/**
* \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.
*
- * \param name the name of the new dependency (can be \c NULL)
- * \param data the user data you want to associate with this dependency (can be \c NULL)
+ * \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()
*/
void SD_task_dependency_add(const char *name, void *data, SD_task_t src, SD_task_t dst)
{
- int found = 0;
+ bool found = false;
SD_dependency_t dependency;
unsigned long length = xbt_dynar_length(src->tasks_after);
dependency = xbt_new(s_SD_dependency_t, 1);
- dependency->name = xbt_strdup(name); /* xbt_strdup is cleaver enough to deal with NULL args itself */
+ dependency->name = xbt_strdup(name); /* xbt_strdup is cleaver enough to deal with nullptr args itself */
dependency->data = data;
dependency->src = src;
dependency->dst = dst;
}
/**
- * \brief Returns the name given as input when dependency has been created..
+ * \brief Returns the name given as input when dependency has been created.
*
* \param src a task
* \param dst a task depending on \a src
- *
*/
-const char *SD_task_dependency_get_name(SD_task_t src, SD_task_t dst){
+const char *SD_task_dependency_get_name(SD_task_t src, SD_task_t dst)
+{
unsigned int i;
SD_dependency_t dependency;
if (dependency->dst == dst)
return dependency->name;
}
- return NULL;
+ return nullptr;
}
/**
* \param src a task
* \param dst a task depending on \a src
*
- * If src is NULL, checks whether dst has any pre-dependency.
- * If dst is NULL, checks whether src has any post-dependency.
+ * 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)
{
- xbt_assert(src != NULL || dst != NULL, "Invalid parameter: both src and dst are NULL");
+ xbt_assert(src != nullptr || dst != nullptr, "Invalid parameter: both src and dst are nullptr");
if (src) {
if (dst) {
void SD_task_dependency_remove(SD_task_t src, SD_task_t dst)
{
unsigned long length;
- int found = 0;
+ bool found = false;
SD_dependency_t dependency;
/* remove the dependency from src->tasks_after */
for (unsigned long i = 0; i < length && !found; i++) {
xbt_dynar_get_cpy(src->tasks_after, i, &dependency);
if (dependency->dst == dst) {
- xbt_dynar_remove_at(src->tasks_after, i, NULL);
- found = 1;
+ xbt_dynar_remove_at(src->tasks_after, i, nullptr);
+ found = true;
}
}
if (!found)
/* remove the dependency from dst->tasks_before */
length = xbt_dynar_length(dst->tasks_before);
- found = 0;
+ found = false;
for (unsigned long i = 0; i < length && !found; i++) {
xbt_dynar_get_cpy(dst->tasks_before, i, &dependency);
if (dependency->src == src) {
- xbt_dynar_remove_at(dst->tasks_before, i, NULL);
+ xbt_dynar_remove_at(dst->tasks_before, i, nullptr);
__SD_task_dependency_destroy(dependency);
dst->unsatisfied_dependencies--;
dst->is_not_ready--;
- found = 1;
+ found = true;
}
}
/* should never happen... */
*
* \param src a task
* \param dst a task depending on \a src
- * \return the user data associated with this dependency (can be \c NULL)
+ * \return the user data associated with this dependency (can be \c nullptr)
* \see SD_task_dependency_add()
*/
void *SD_task_dependency_get_data(SD_task_t src, SD_task_t dst)
{
- int found = 0;
+ bool found = false;
SD_dependency_t dependency;
unsigned long length = xbt_dynar_length(src->tasks_after);
* \param task the task to evaluate
* \param workstation_nb number of workstations on which the task would be executed
* \param workstation_list the workstations on which the task would be executed
- * \param flops_amount computation amount for each workstation
- * \param bytes_amount communication amount between each pair of workstations
+ * \param flops_amount computation amount for each workstation (i.e., an array of workstation_nb doubles)
+ * \param bytes_amount communication amount between each pair of workstations (i.e., a matrix of
+ * workstation_nb*workstation_nb doubles)
* \see SD_schedule()
*/
double SD_task_get_execution_time(SD_task_t task, int workstation_nb, const sg_host_t *workstation_list,
/* the task execution time is the maximum execution time of the parallel tasks */
for (int i = 0; i < workstation_nb; i++) {
double time = 0.0;
- if (flops_amount != NULL)
- time = flops_amount[i] / sg_host_speed(workstation_list[i]);
+ if (flops_amount != nullptr)
+ time = flops_amount[i] / workstation_list[i]->speed();
- if (bytes_amount != NULL)
+ if (bytes_amount != nullptr)
for (int j = 0; j < workstation_nb; j++) {
if (bytes_amount[i * workstation_nb + j] !=0 ) {
time += (SD_route_get_latency(workstation_list[i], workstation_list[j]) +
return max_time;
}
-static XBT_INLINE void SD_task_do_schedule(SD_task_t task)
+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));
* 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 workstations on which the task will be executed
- * \param workstation_list the workstations on which the task will be executed
- * \param flops_amount computation amount for each workstation
- * \param bytes_amount communication amount between each pair of workstations
+ * \param host_count number of hosts on which the task will be executed
+ * \param workstation_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()
*/
task->rate = rate;
if (flops_amount) {
- task->flops_amount = (double*)xbt_realloc(task->flops_amount, sizeof(double) * host_count);
+ task->flops_amount = static_cast<double*>(xbt_realloc(task->flops_amount, sizeof(double) * host_count));
memcpy(task->flops_amount, flops_amount, sizeof(double) * host_count);
} else {
xbt_free(task->flops_amount);
- task->flops_amount = NULL;
+ task->flops_amount = nullptr;
}
int communication_nb = host_count * host_count;
if (bytes_amount) {
- task->bytes_amount = (double*)xbt_realloc(task->bytes_amount, sizeof(double) * communication_nb);
+ task->bytes_amount = static_cast<double*>(xbt_realloc(task->bytes_amount, sizeof(double) * communication_nb));
memcpy(task->bytes_amount, bytes_amount, sizeof(double) * communication_nb);
} else {
xbt_free(task->bytes_amount);
- task->bytes_amount = NULL;
+ task->bytes_amount = nullptr;
}
- task->host_list = (sg_host_t*) xbt_realloc(task->host_list, sizeof(sg_host_t) * host_count);
+ task->host_list = static_cast<sg_host_t*>(xbt_realloc(task->host_list, sizeof(sg_host_t) * host_count));
memcpy(task->host_list, workstation_list, sizeof(sg_host_t) * host_count);
SD_task_do_schedule(task);
/* Don't free scheduling data for typed tasks */
__SD_task_destroy_scheduling_data(task);
xbt_free(task->host_list);
- task->host_list=NULL;
+ task->host_list=nullptr;
task->host_count = 0;
}
task->start_time = -1.0;
}
-/* Destroys the data memorized by SD_task_schedule. Task state must be SD_SCHEDULED or SD_RUNNABLE.
- */
-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));
-
- xbt_free(task->flops_amount);
- xbt_free(task->bytes_amount);
- task->flops_amount = task->bytes_amount = NULL;
-}
-
/* Runs a task. */
void SD_task_run(SD_task_t task)
{
xbt_assert(SD_task_get_state(task) == SD_RUNNABLE, "Task '%s' is not runnable! Task state: %d",
SD_task_get_name(task), (int)SD_task_get_state(task));
- xbt_assert(task->host_list != NULL, "Task '%s': workstation_list is NULL!", SD_task_get_name(task));
+ xbt_assert(task->host_list != nullptr, "Task '%s': workstation_list is nullptr!", SD_task_get_name(task));
XBT_DEBUG("Running task '%s'", SD_task_get_name(task));
SD_task_set_state(task, SD_RUNNING);
}
-/*
- * Remove all dependencies associated with a task. This function is called when the task is destroyed.
- */
-static void __SD_task_remove_dependencies(SD_task_t task)
-{
- /* we must destroy the dependencies carefuly (with SD_dependency_remove) because each one is stored twice */
- SD_dependency_t dependency;
- while (!xbt_dynar_is_empty(task->tasks_before)) {
- xbt_dynar_get_cpy(task->tasks_before, 0, &dependency);
- SD_task_dependency_remove(dependency->src, dependency->dst);
- }
-
- while (!xbt_dynar_is_empty(task->tasks_after)) {
- xbt_dynar_get_cpy(task->tasks_after, 0, &dependency);
- SD_task_dependency_remove(dependency->src, dependency->dst);
- }
-}
-
/**
* \brief Returns the start time of a task
*
switch (task->kind) {
case SD_TASK_COMP_PAR_AMDAHL:
SD_task_distribute_comp_amdahl(task, count);
+ /* no break */
case SD_TASK_COMM_E2E:
case SD_TASK_COMP_SEQ:
xbt_assert(task->host_count == count, "Got %d locations, but were expecting %d locations", count,task->host_count);
double src_start, src_end, dst_start, dst_end;
src_nb = before->host_count;
dst_nb = count;
- before->host_list = (sg_host_t*) xbt_realloc(before->host_list, (before->host_count+count)*sizeof(sg_host_t));
+ before->host_list = static_cast<sg_host_t*>(xbt_realloc(before->host_list, (before->host_count+count)*sizeof(sg_host_t)));
for(i=0; i<count; i++)
before->host_list[before->host_count+i] = task->host_list[i];
if (SD_task_get_state(before)< SD_SCHEDULED) {
SD_task_do_schedule(before);
- XBT_VERB
- ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.",
+ XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.",
SD_task_get_name(before),before->amount, src_nb, dst_nb);
}
}
double src_start, src_end, dst_start, dst_end;
src_nb = count;
dst_nb = after->host_count;
- after->host_list = (sg_host_t*) xbt_realloc(after->host_list, (after->host_count+count)*sizeof(sg_host_t));
+ after->host_list = static_cast<sg_host_t*>(xbt_realloc(after->host_list, (after->host_count+count)*sizeof(sg_host_t)));
for(i=after->host_count - 1; i>=0; i--)
after->host_list[count+i] = after->host_list[i];
for(i=0; i<count; i++)