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 carefuly (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);
+ }
+}
+
+/* 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 = NULL;
+ task->bytes_amount = NULL;
+}
-void* SD_task_new_f(void)
+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);
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;
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);
*/
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);
xbt_dynar_push(sd_global->completed_task_set,&task);
task->finish_time = task->surf_action->getFinishTime();
task->remains = 0;
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
jedule_log_sd_event(task);
#endif
break;
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
*
*/
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);
}
/**
- * \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;
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 */
xbt_dynar_get_cpy(src->tasks_after, i, &dependency);
if (dependency->dst == dst) {
xbt_dynar_remove_at(src->tasks_after, i, NULL);
- found = 1;
+ 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);
__SD_task_dependency_destroy(dependency);
dst->unsatisfied_dependencies--;
dst->is_not_ready--;
- found = 1;
+ found = true;
}
}
/* should never happen... */
*/
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);
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]);
+ time = flops_amount[i] / workstation_list[i]->speed();
if (bytes_amount != NULL)
for (int j = 0; j < workstation_nb; 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));
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);
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->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);
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)
{
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);