xbt_free(task->communication_amount);
xbt_free(task->computation_amount);
- xbt_mallocator_release(sd_global->task_mallocator,task);
- sd_global->task_number--;
-
#ifdef HAVE_TRACING
if (task->category) xbt_free(task->category);
#endif
+ xbt_mallocator_release(sd_global->task_mallocator,task);
+ sd_global->task_number--;
+
XBT_DEBUG("Task destroyed.");
}
/**
* \brief Sets the rate of a task
*
- * This will change the percentage of the available power or network bandwidth
- * a task can use.
+ * This will change the network bandwidth a task can use. 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.
*
- * \param task a task
- * \param rate the new rate you want to associate with this task
+ * 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.
*/
void SD_task_set_rate(SD_task_t task, double rate)
{
+ xbt_assert(task->kind == SD_TASK_COMM_E2E,
+ "The rate can be modified for end-to-end communications only.");
+
task->rate = rate;
}
SD_task_get_name(task));
if (__SD_task_is_scheduled_or_runnable(task) /* if the task is scheduled or runnable */
- &&task->kind == SD_TASK_NOT_TYPED) /* Don't free scheduling data for typed tasks */
+ && ((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);
+ task->workstation_list=NULL;
+ task->workstation_nb = 0;
+ }
if (__SD_task_is_running(task)) /* the task should become SD_FAILED */
surf_workstation_model->action_cancel(task->surf_action);
"Task '%s': workstation_list is NULL!",
SD_task_get_name(task));
-
-
XBT_DEBUG("Really running task '%s'", SD_task_get_name(task));
+ int workstation_nb = task->workstation_nb;
/* set this task as current task for the workstations in sequential mode */
- for (i = 0; i < task->workstation_nb; i++) {
+ for (i = 0; i < workstation_nb; i++) {
if (SD_workstation_get_access_mode(task->workstation_list[i]) ==
SD_WORKSTATION_SEQUENTIAL_ACCESS) {
task->workstation_list[i]->current_task = task;
/* we have to create a Surf workstation array instead of the SimDag
* workstation array */
- surf_workstations = xbt_new(void *, task->workstation_nb);
+ surf_workstations = xbt_new(void *, workstation_nb);
- for (i = 0; i < task->workstation_nb; i++)
+ for (i = 0; i < workstation_nb; i++)
surf_workstations[i] = task->workstation_list[i]->surf_workstation;
- /* It's allowed to pass a NULL vector as cost to mean vector of 0.0 (easing
- * user's life). Let's deal with it */
-#define cost_or_zero(array,pos) ((array)?(array)[pos]:0.0)
+ double *computation_amount = xbt_new0(double, workstation_nb);
+ double *communication_amount = xbt_new0(double, workstation_nb * workstation_nb);
- task->surf_action = NULL;
- if ((task->workstation_nb == 1)
- && (cost_or_zero(task->communication_amount, 0) == 0.0)) {
- task->surf_action =
- surf_workstation_model->extension.
- workstation.execute(surf_workstations[0],
- cost_or_zero(task->computation_amount, 0));
- } else if ((task->workstation_nb == 1)
- && (cost_or_zero(task->computation_amount, 0) == 0.0)) {
-
- task->surf_action =
- surf_workstation_model->extension.
- workstation.communicate(surf_workstations[0], surf_workstations[0],
- cost_or_zero(task->communication_amount,
- 0), task->rate);
- } else if ((task->workstation_nb == 2)
- && (cost_or_zero(task->computation_amount, 0) == 0.0)
- && (cost_or_zero(task->computation_amount, 1) == 0.0)) {
- int nb = 0;
- double value = 0.0;
-
- for (i = 0; i < task->workstation_nb * task->workstation_nb; i++) {
- if (cost_or_zero(task->communication_amount, i) > 0.0) {
- nb++;
- value = cost_or_zero(task->communication_amount, i);
- }
- }
- if (nb == 1) {
- task->surf_action =
- surf_workstation_model->extension.
- workstation.communicate(surf_workstations[0],
- surf_workstations[1], value, task->rate);
- }
- }
-#undef cost_or_zero
-
- if (!task->surf_action) {
- double *computation_amount = xbt_new(double, task->workstation_nb);
- double *communication_amount = xbt_new(double, task->workstation_nb *
- task->workstation_nb);
+ if(task->computation_amount)
memcpy(computation_amount, task->computation_amount, sizeof(double) *
- task->workstation_nb);
+ workstation_nb);
+ if(task->communication_amount)
memcpy(communication_amount, task->communication_amount,
- sizeof(double) * task->workstation_nb * task->workstation_nb);
+ sizeof(double) * workstation_nb * workstation_nb);
- task->surf_action =
+ task->surf_action =
surf_workstation_model->extension.
- workstation.execute_parallel_task(task->workstation_nb,
+ workstation.execute_parallel_task(workstation_nb,
surf_workstations,
computation_amount,
communication_amount,
task->rate);
- } else {
- xbt_free(surf_workstations);
- }
surf_workstation_model->action_data_set(task->surf_action, task);
xbt_assert(task->workstation_nb == count,"Got %d locations, but were expecting %d locations",count,task->workstation_nb);
for (i = 0; i < count; i++)
task->workstation_list[i] = list[i];
+ if (SD_task_get_kind(task)== SD_TASK_COMP_SEQ && !task->computation_amount){
+ /*This task has failed and is rescheduled. Reset the computation amount*/
+ task->computation_amount = xbt_new0(double, 1);
+ task->computation_amount[0] = task->remains;
+ }
SD_task_do_schedule(task);
break;
default:
