/* 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/HostImplem.hpp"
+#include "src/surf/HostImpl.hpp"
#include "src/surf/surf_interface.hpp"
#include "src/simdag/simdag_private.h"
#include "simgrid/simdag.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 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);
+ }
+}
+
+/* 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;
+}
void* SD_task_new_f(void)
{
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->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;
}
}
-/* 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
*
}
/**
- * \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;
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->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
*
