X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2405c1a902dc830946d96db7e46d9c1d6d489bc..cdc5e6b304490c7f11223bea097fea9fd2a2dfee:/src/simdag/sd_task.c diff --git a/src/simdag/sd_task.c b/src/simdag/sd_task.c index d6df6f7bc4..f0cf1c3a96 100644 --- a/src/simdag/sd_task.c +++ b/src/simdag/sd_task.c @@ -174,7 +174,7 @@ SD_task_t SD_task_create_comp_par_amdahl(const char *name, void *data, { xbt_assert(alpha < 1. && alpha >= 0., "Invalid parameter: alpha must be in [0.;1.["); - + SD_task_t res = SD_task_create(name, data, amount); res->alpha = alpha; res->kind = SD_TASK_COMP_PAR_AMDAHL; @@ -239,13 +239,13 @@ void SD_task_destroy(SD_task_t task) 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."); } @@ -279,14 +279,22 @@ void SD_task_set_data(SD_task_t task, void *data) /** * \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; } @@ -579,7 +587,7 @@ void SD_task_dependency_add(const char *name, void *data, SD_task_t src, && !__SD_task_is_scheduled_or_runnable(src) && !__SD_task_is_running(src)) THROWF(arg_error, 0, "Task '%s' must be SD_NOT_SCHEDULED, SD_SCHEDULABLE, SD_SCHEDULED or SD_RUNNABLE" - " or SD_RUNNING", + " or SD_RUNNING", SD_task_get_name(src)); if (!__SD_task_is_not_scheduled(dst) && !__SD_task_is_schedulable(dst) @@ -965,8 +973,12 @@ void SD_task_unschedule(SD_task_t task) 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); @@ -1428,6 +1440,11 @@ void SD_task_schedulev(SD_task_t task, int count, 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: @@ -1442,12 +1459,6 @@ void SD_task_schedulev(SD_task_t task, int count, task->communication_amount[2]); } - if (task->kind == SD_TASK_COMP_PAR_AMDAHL) { - XBT_VERB("Schedule computation task %s on %d hosts. It costs %.f flops on each host", - SD_task_get_name(task), - task->workstation_nb, - task->computation_amount[0]); - } /* Iterate over all childs and parent being COMM_E2E to say where I am located (and start them if runnable) */ if (task->kind == SD_TASK_COMP_SEQ) { @@ -1472,55 +1483,6 @@ void SD_task_schedulev(SD_task_t task, int count, SD_workstation_get_name(before->workstation_list[1]), before->communication_amount[2]); } - } else if (before->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ - if (!before->workstation_list){ - before->workstation_list = xbt_new0(SD_workstation_t, count); - for (i=0;iworkstation_list[i] = task->workstation_list[i]; - } else { - int src_nb, dst_nb, src_start, src_end, dst_start, dst_end; - src_nb = before->workstation_nb; - dst_nb = count; - before->workstation_list = (SD_workstation_t*) xbt_realloc( - before->workstation_list, - (before->workstation_nb+count)*sizeof(s_SD_workstation_t)); - for(i=0; iworkstation_list[before->workstation_nb+i] = - task->workstation_list[i]; - - before->workstation_nb += count; - - before->computation_amount = xbt_new0(double, - before->workstation_nb); - before->communication_amount = xbt_new0(double, - before->workstation_nb* - before->workstation_nb); - - for(i=0;iamount/src_nb; - src_end = src_start + before->amount/src_nb; - for(j=0; jamount/dst_nb; - dst_end = dst_start + before->amount/dst_nb; - if ((src_end <= dst_start) || (dst_end <= src_start)) { - before->communication_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0; - } else { - before->communication_amount[i*(src_nb+dst_nb)+src_nb+j] = - MIN(src_end, dst_end)- MAX(src_start, dst_start); - } - } - } - - if (__SD_task_is_schedulable(before) || - __SD_task_is_not_scheduled(before)) { - SD_task_do_schedule(before); - 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); - } - } } } xbt_dynar_foreach(task->tasks_after, cpt, dep) { @@ -1539,53 +1501,132 @@ void SD_task_schedulev(SD_task_t task, int count, after->communication_amount[2]); } - } else if (after->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ - if (!after->workstation_list){ - after->workstation_list = xbt_new0(SD_workstation_t, count); - for (i=0;iworkstation_list[i] = task->workstation_list[i]; - } else { - int src_nb, dst_nb, src_start, src_end, dst_start, dst_end; - src_nb = count;; - dst_nb = after->workstation_nb; - after->workstation_list = (SD_workstation_t*) xbt_realloc( - after->workstation_list, - (after->workstation_nb+count)*sizeof(s_SD_workstation_t)); - for(i=after->workstation_nb - 1; i>=0; i--) - after->workstation_list[count+i] = after->workstation_list[i]; - - for(i=0; iworkstation_list[i] = task->workstation_list[i]; - - after->workstation_nb += count; - - after->computation_amount = xbt_new0(double, after->workstation_nb); - after->communication_amount = xbt_new0(double, - after->workstation_nb* - after->workstation_nb); - - for(i=0;iamount/src_nb; - src_end = src_start + after->amount/src_nb; - for(j=0; jamount/dst_nb; - dst_end = dst_start + after->amount/dst_nb; - if ((src_end <= dst_start) || (dst_end <= src_start)) { - after->communication_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0; - } else { - after->communication_amount[i*(src_nb+dst_nb)+src_nb+j] = - MIN(src_end, dst_end)- MAX(src_start, dst_start); - } + } + } + } + /* Iterate over all childs and parent being MXN_1D_BLOC to say where I am located (and start them if runnable) */ + if (task->kind == SD_TASK_COMP_PAR_AMDAHL) { + XBT_VERB("Schedule computation task %s on %d workstations. %.f flops" + " will be distributed following Amdahl'Law", + SD_task_get_name(task), task->workstation_nb, + task->computation_amount[0]); + xbt_dynar_foreach(task->tasks_before, cpt, dep) { + SD_task_t before = dep->src; + if (before->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ + if (!before->workstation_list){ + XBT_VERB("Sender side of Task %s is not scheduled yet. Fill the workstation list with receiver side", + SD_task_get_name(before)); + before->workstation_list = xbt_new0(SD_workstation_t, count); + before->workstation_nb = count; + for (i=0;iworkstation_list[i] = task->workstation_list[i]; + } else { + int src_nb, dst_nb; + double src_start, src_end, dst_start, dst_end; + src_nb = before->workstation_nb; + dst_nb = count; + before->workstation_list = (SD_workstation_t*) xbt_realloc( + before->workstation_list, + (before->workstation_nb+count)*sizeof(s_SD_workstation_t)); + for(i=0; iworkstation_list[before->workstation_nb+i] = + task->workstation_list[i]; + + before->workstation_nb += count; + + before->computation_amount = xbt_new0(double, + before->workstation_nb); + before->communication_amount = xbt_new0(double, + before->workstation_nb* + before->workstation_nb); + + for(i=0;iamount/src_nb; + src_end = src_start + before->amount/src_nb; + for(j=0; jamount/dst_nb; + dst_end = dst_start + before->amount/dst_nb; + XBT_VERB("(%s->%s): (%.2f, %.2f)-> (%.2f, %.2f)", + SD_workstation_get_name(before->workstation_list[i]), + SD_workstation_get_name(before->workstation_list[src_nb+j]), + src_start, src_end, dst_start, dst_end); + if ((src_end <= dst_start) || (dst_end <= src_start)) { + before->communication_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0; + } else { + before->communication_amount[i*(src_nb+dst_nb)+src_nb+j] = + MIN(src_end, dst_end) - MAX(src_start, dst_start); } + XBT_VERB("==> %.2f", + before->communication_amount[i*(src_nb+dst_nb)+src_nb+j]); } + } - if (__SD_task_is_schedulable(after) || - __SD_task_is_not_scheduled(after)) { - SD_task_do_schedule(after); - XBT_VERB + if (__SD_task_is_schedulable(before) || + __SD_task_is_not_scheduled(before)) { + SD_task_do_schedule(before); + XBT_VERB ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.", - SD_task_get_name(after),after->amount, src_nb, dst_nb); + SD_task_get_name(before),before->amount, src_nb, dst_nb); } + } + } + } + xbt_dynar_foreach(task->tasks_after, cpt, dep) { + SD_task_t after = dep->dst; + if (after->kind == SD_TASK_COMM_PAR_MXN_1D_BLOCK){ + if (!after->workstation_list){ + XBT_VERB("Receiver side of Task %s is not scheduled yet. Fill the workstation list with sender side", + SD_task_get_name(after)); + after->workstation_list = xbt_new0(SD_workstation_t, count); + after->workstation_nb = count; + for (i=0;iworkstation_list[i] = task->workstation_list[i]; + } else { + int src_nb, dst_nb; + double src_start, src_end, dst_start, dst_end; + src_nb = count; + dst_nb = after->workstation_nb; + after->workstation_list = (SD_workstation_t*) xbt_realloc( + after->workstation_list, + (after->workstation_nb+count)*sizeof(s_SD_workstation_t)); + for(i=after->workstation_nb - 1; i>=0; i--) + after->workstation_list[count+i] = after->workstation_list[i]; + for(i=0; iworkstation_list[i] = task->workstation_list[i]; + + after->workstation_nb += count; + + after->computation_amount = xbt_new0(double, after->workstation_nb); + after->communication_amount = xbt_new0(double, + after->workstation_nb* + after->workstation_nb); + + for(i=0;iamount/src_nb; + src_end = src_start + after->amount/src_nb; + for(j=0; jamount/dst_nb; + dst_end = dst_start + after->amount/dst_nb; + XBT_VERB("(%d->%d): (%.2f, %.2f)-> (%.2f, %.2f)", + i, j, src_start, src_end, dst_start, dst_end); + if ((src_end <= dst_start) || (dst_end <= src_start)) { + after->communication_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0; + } else { + after->communication_amount[i*(src_nb+dst_nb)+src_nb+j] = + MIN(src_end, dst_end)- MAX(src_start, dst_start); + } + XBT_VERB("==> %.2f", + after->communication_amount[i*(src_nb+dst_nb)+src_nb+j]); + } + } + + if (__SD_task_is_schedulable(after) || + __SD_task_is_not_scheduled(after)) { + SD_task_do_schedule(after); + XBT_VERB + ("Auto-Schedule redistribution task %s. Send %.f bytes from %d hosts to %d hosts.", + SD_task_get_name(after),after->amount, src_nb, dst_nb); + } } } }