task->kind = SD_TASK_NOT_TYPED;
task->state= SD_NOT_SCHEDULED;
xbt_dynar_push(sd_global->initial_task_set,&task);
- task->return_hookup.prev = NULL;
- task->return_hookup.next = NULL;
task->marked = 0;
task->is_not_ready = 0;
/* scheduling parameters */
- task->workstation_nb = 0;
- task->workstation_list = NULL;
+ task->host_count = 0;
+ task->host_list = NULL;
task->flops_amount = NULL;
task->bytes_amount = NULL;
task->rate = -1;
sd_global->task_number++;
- TRACE_sd_task_create(task);
-
return task;
}
SD_task_t task = SD_task_create(name, data, amount);
task->bytes_amount = xbt_new0(double, ws_count * ws_count);
task->flops_amount = xbt_new0(double, ws_count);
- task->workstation_nb = ws_count;
- task->workstation_list = xbt_new0(SD_workstation_t, ws_count);
+ task->host_count = ws_count;
+ task->host_list = xbt_new0(sg_host_t, ws_count);
return task;
}
res->bytes_amount[2] = amount;
res->kind = SD_TASK_COMM_E2E;
- TRACE_category("COMM_E2E");
- TRACE_sd_set_task_category(res, "COMM_E2E");
-
return res;
}
res->flops_amount[0] = flops_amount;
res->kind = SD_TASK_COMP_SEQ;
- TRACE_category("COMP_SEQ");
- TRACE_sd_set_task_category(res, "COMP_SEQ");
-
return res;
}
res->alpha = alpha;
res->kind = SD_TASK_COMP_PAR_AMDAHL;
- TRACE_category("COMP_PAR_AMDAHL");
- TRACE_sd_set_task_category(res, "COMP_PAR_AMDAHL");
-
return res;
}
double amount)
{
SD_task_t res = SD_task_create(name, data, amount);
- res->workstation_list=NULL;
+ res->host_list=NULL;
res->kind = SD_TASK_COMM_PAR_MXN_1D_BLOCK;
- TRACE_category("COMM_PAR_MXN_1D_BLOCK");
- TRACE_sd_set_task_category(res, "COMM_PAR_MXN_1D_BLOCK");
-
return res;
}
*/
void SD_task_destroy(SD_task_t task)
{
+ int idx;
XBT_DEBUG("Destroying task %s...", SD_task_get_name(task));
__SD_task_remove_dependencies(task);
if (__SD_task_is_scheduled_or_runnable(task))
__SD_task_destroy_scheduling_data(task);
- xbt_swag_remove(task, sd_global->return_set);
+ 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_free(task->name);
if (task->surf_action != NULL)
- task->surf_action->unref();
+ task->surf_action->unref();
- xbt_free(task->workstation_list);
+ xbt_free(task->host_list);
xbt_free(task->bytes_amount);
xbt_free(task->flops_amount);
- TRACE_sd_task_destroy(task);
-
xbt_mallocator_release(sd_global->task_mallocator,task);
sd_global->task_number--;
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), &task);
+ xbt_dynar_search(sd_global->completed_task_set, &task), NULL);
xbt_dynar_push(sd_global->initial_task_set,&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), &task);
+ xbt_dynar_search(sd_global->executable_task_set, &task), NULL);
xbt_dynar_push(sd_global->initial_task_set,&task);
}
break;
- case SD_IN_FIFO:
- xbt_dynar_remove_at(sd_global->executable_task_set,
- xbt_dynar_search(sd_global->executable_task_set, &task), &task);
- xbt_dynar_push(sd_global->initial_task_set,&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, &task);
+ xbt_dynar_remove_at(sd_global->initial_task_set, idx, NULL);
xbt_dynar_push(sd_global->executable_task_set,&task);
}
break;
case SD_RUNNING:
- 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), &task);
- } else {
- if (SD_task_get_state(task) == SD_IN_FIFO){
- xbt_dynar_remove_at(sd_global->initial_task_set,
- xbt_dynar_search(sd_global->initial_task_set, &task), &task);
- }
- }
+ xbt_dynar_search(sd_global->executable_task_set, &task), NULL);
break;
case SD_DONE:
xbt_dynar_push(sd_global->completed_task_set,&task);
*/
int SD_task_get_workstation_count(SD_task_t task)
{
- return task->workstation_nb;
+ return task->host_count;
}
/**
* Only call this on already scheduled tasks!
* \param task a task
*/
-SD_workstation_t *SD_task_get_workstation_list(SD_task_t task)
+sg_host_t *SD_task_get_workstation_list(SD_task_t task)
{
- return task->workstation_list;
+ return task->host_list;
}
/**
char *statename;
XBT_INFO("Displaying task %s", SD_task_get_name(task));
- statename = bprintf("%s %s %s %s %s %s %s %s",
- (task->state == SD_NOT_SCHEDULED ? "not scheduled" :
+ statename = bprintf("%s%s%s%s%s%s%s",
+ (task->state == SD_NOT_SCHEDULED ? " not scheduled" :
""),
- (task->state == SD_SCHEDULABLE ? "schedulable" : ""),
- (task->state == SD_SCHEDULED ? "scheduled" : ""),
- (task->state == SD_RUNNABLE ? "runnable" :
- "not runnable"),
- (task->state == SD_IN_FIFO ? "in fifo" : ""),
- (task->state == SD_RUNNING ? "running" : ""),
- (task->state == SD_DONE ? "done" : ""),
- (task->state == SD_FAILED ? "failed" : ""));
- XBT_INFO(" - state: %s", statename);
+ (task->state == SD_SCHEDULABLE ? " schedulable" : ""),
+ (task->state == SD_SCHEDULED ? " scheduled" : ""),
+ (task->state == SD_RUNNABLE ? " runnable" :
+ " not runnable"),
+ (task->state == SD_RUNNING ? " running" : ""),
+ (task->state == SD_DONE ? " done" : ""),
+ (task->state == SD_FAILED ? " failed" : ""));
+ XBT_INFO(" - state:%s", statename);
free(statename);
if (task->kind != 0) {
*/
double SD_task_get_execution_time(SD_task_t task,
int workstation_nb,
- const SD_workstation_t *
+ const sg_host_t *
workstation_list,
const double *flops_amount,
const double *bytes_amount)
for (i = 0; i < workstation_nb; i++) {
time = 0.0;
if (flops_amount != NULL)
- time =
- SD_workstation_get_computation_time(workstation_list[i],
- flops_amount[i]);
+ time = flops_amount[i] / sg_host_speed(workstation_list[i]);
if (bytes_amount != NULL)
for (j = 0; j < workstation_nb; j++) {
- time +=
- SD_route_get_communication_time(workstation_list[i],
- workstation_list[j],
- bytes_amount[i *
- workstation_nb
- + j]);
+ if (bytes_amount[i * workstation_nb + j] !=0 ) {
+ time += (SD_route_get_latency(workstation_list[i],
+ workstation_list[j]) +
+ bytes_amount[i * workstation_nb + j] /
+ SD_route_get_bandwidth(workstation_list[i],
+ workstation_list[j]));
+ }
}
if (time > max_time) {
* \see SD_task_unschedule()
*/
void SD_task_schedule(SD_task_t task, int workstation_count,
- const SD_workstation_t * workstation_list,
+ const sg_host_t * workstation_list,
const double *flops_amount,
const double *bytes_amount, double rate)
{
xbt_assert(workstation_count > 0, "workstation_nb must be positive");
- task->workstation_nb = workstation_count;
+ task->host_count = workstation_count;
task->rate = rate;
if (flops_amount) {
task->bytes_amount = NULL;
}
- task->workstation_list = (SD_workstation_t*)
- xbt_realloc(task->workstation_list,
- sizeof(SD_workstation_t) * workstation_count);
- memcpy(task->workstation_list, workstation_list,
- sizeof(SD_workstation_t) * workstation_count);
+ task->host_list = (sg_host_t*)
+ xbt_realloc(task->host_list,
+ sizeof(sg_host_t) * workstation_count);
+ memcpy(task->host_list, workstation_list,
+ sizeof(sg_host_t) * workstation_count);
SD_task_do_schedule(task);
}
&& ((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);
- xbt_free(task->workstation_list);
- task->workstation_list=NULL;
- task->workstation_nb = 0;
+ xbt_free(task->host_list);
+ task->host_list=NULL;
+ task->host_count = 0;
}
if (SD_task_get_state(task) == SD_RUNNING)
*/
static void __SD_task_destroy_scheduling_data(SD_task_t task)
{
- if (!__SD_task_is_scheduled_or_runnable(task)
- && SD_task_get_state(task) != SD_IN_FIFO)
+ if (!__SD_task_is_scheduled_or_runnable(task))
THROWF(arg_error, 0,
- "Task '%s' must be SD_SCHEDULED, SD_RUNNABLE or SD_IN_FIFO",
+ "Task '%s' must be SD_SCHEDULED or SD_RUNNABLE",
SD_task_get_name(task));
xbt_free(task->flops_amount);
* the task doesn't have to wait in FIFOs. Otherwise, it is called by
* __SD_task_just_done when the task gets out of its FIFOs.
*/
-void __SD_task_really_run(SD_task_t task)
+void SD_task_run(SD_task_t task)
{
int i;
sg_host_t *hosts;
- xbt_assert(__SD_task_is_runnable_or_in_fifo(task),
- "Task '%s' is not runnable or in a fifo! Task state: %d",
+ 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->workstation_list != NULL,
+ xbt_assert(task->host_list != NULL,
"Task '%s': workstation_list is NULL!",
SD_task_get_name(task));
- XBT_DEBUG("Really running task '%s'", SD_task_get_name(task));
- int host_nb = task->workstation_nb;
-
- /* set this task as current task for the workstations in sequential mode */
- for (i = 0; i < host_nb; i++) {
- if (SD_workstation_get_access_mode(task->workstation_list[i]) ==
- SD_WORKSTATION_SEQUENTIAL_ACCESS) {
- sg_host_sd(task->workstation_list[i])->current_task = task;
- xbt_assert(__SD_workstation_is_busy(task->workstation_list[i]),
- "The workstation should be busy now");
- }
- }
-
- XBT_DEBUG("Task '%s' set as current task for its workstations",
- SD_task_get_name(task));
-
- /* start the task */
+ XBT_DEBUG("Running task '%s'", SD_task_get_name(task));
/* Copy the elements of the task into the action */
+ int host_nb = task->host_count;
hosts = xbt_new(sg_host_t, host_nb);
for (i = 0; i < host_nb; i++)
- hosts[i] = task->workstation_list[i];
+ hosts[i] = task->host_list[i];
double *flops_amount = xbt_new0(double, host_nb);
double *bytes_amount = xbt_new0(double, host_nb * host_nb);
-
if(task->flops_amount)
- memcpy(flops_amount, task->flops_amount, sizeof(double) *
- host_nb);
+ memcpy(flops_amount, task->flops_amount, sizeof(double) * host_nb);
if(task->bytes_amount)
memcpy(bytes_amount, task->bytes_amount,
sizeof(double) * host_nb * host_nb);
}
-/* Tries to run a task. This function is called by SD_simulate() when a
- * scheduled task becomes SD_RUNNABLE (i.e., when its dependencies are
- * satisfied).
- * If one of the workstations where the task is scheduled on is busy (in
- * sequential mode), the task doesn't start.
- * Returns whether the task has started.
- */
-int __SD_task_try_to_run(SD_task_t task)
-{
-
- int can_start = 1;
- int i;
- SD_workstation_t workstation;
-
- 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));
-
-
- for (i = 0; i < task->workstation_nb; i++) {
- can_start = can_start &&
- !__SD_workstation_is_busy(task->workstation_list[i]);
- }
-
- XBT_DEBUG("Task '%s' can start: %d", SD_task_get_name(task), can_start);
-
- if (!can_start) { /* if the task cannot start and is not in the FIFOs yet */
- for (i = 0; i < task->workstation_nb; i++) {
- workstation = task->workstation_list[i];
- if (sg_host_sd(workstation)->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) {
- XBT_DEBUG("Pushing task '%s' in the FIFO of workstation '%s'",
- SD_task_get_name(task),
- SD_workstation_get_name(workstation));
- xbt_fifo_push(sg_host_sd(workstation)->task_fifo, task);
- }
- }
- SD_task_set_state(task, SD_IN_FIFO);
- XBT_DEBUG("Task '%s' state is now SD_IN_FIFO", SD_task_get_name(task));
- } else {
- __SD_task_really_run(task);
- }
-
- return can_start;
-}
-
-/* This function is called by SD_simulate when a task is done.
- * It updates task->state and task->action and executes if necessary the tasks
- * which were waiting in FIFOs for the end of `task'
- */
-void __SD_task_just_done(SD_task_t task)
-{
- int i, j;
- SD_workstation_t workstation;
-
- SD_task_t candidate;
- int candidate_nb = 0;
- int candidate_capacity = 8;
- SD_task_t *candidates;
- int can_start = 1;
-
- xbt_assert(SD_task_get_state(task)== SD_RUNNING,
- "The task must be running! Task state: %d",
- (int)SD_task_get_state(task));
- xbt_assert(task->workstation_list != NULL,
- "Task '%s': workstation_list is NULL!",
- SD_task_get_name(task));
-
-
- candidates = xbt_new(SD_task_t, 8);
-
- SD_task_set_state(task, SD_DONE);
- task->surf_action->unref();
- task->surf_action = NULL;
-
- XBT_DEBUG("Looking for candidates");
-
- /* if the task was executed on sequential workstations,
- maybe we can execute the next task of the FIFO for each workstation */
- for (i = 0; i < task->workstation_nb; i++) {
- workstation = task->workstation_list[i];
- XBT_DEBUG("Workstation '%s': access_mode = %d",
- SD_workstation_get_name(workstation),
- (int)sg_host_sd(workstation)->access_mode);
- if (sg_host_sd(workstation)->access_mode ==
- SD_WORKSTATION_SEQUENTIAL_ACCESS) {
- xbt_assert(sg_host_sd(workstation)->task_fifo != NULL,
- "Workstation '%s' has sequential access but no FIFO!",
- SD_workstation_get_name(workstation));
- xbt_assert(sg_host_sd(workstation)->current_task =
- task, "Workstation '%s': current task should be '%s'",
- SD_workstation_get_name(workstation),
- SD_task_get_name(task));
-
- /* the task is over so we can release the workstation */
- sg_host_sd(workstation)->current_task = NULL;
-
- XBT_DEBUG("Getting candidate in FIFO");
- candidate = (SD_task_t)
- xbt_fifo_get_item_content(xbt_fifo_get_first_item
- (sg_host_sd(workstation)->task_fifo));
-
- if (candidate != NULL) {
- XBT_DEBUG("Candidate: '%s'", SD_task_get_name(candidate));
- xbt_assert(SD_task_get_state(candidate) == SD_IN_FIFO,
- "Bad state of candidate '%s': %d",
- SD_task_get_name(candidate),
- (int)SD_task_get_state(candidate));
- }
-
- XBT_DEBUG("Candidate in fifo: %p", candidate);
-
- /* if there was a task waiting for my place */
- if (candidate != NULL) {
- /* Unfortunately, we are not sure yet that we can execute the task now,
- because the task can be waiting more deeply in some other
- workstation's FIFOs ...
- So we memorize all candidate tasks, and then we will check for each
- candidate whether or not all its workstations are available. */
-
- /* realloc if necessary */
- if (candidate_nb == candidate_capacity) {
- candidate_capacity *= 2;
- candidates = (SD_task_t*)
- xbt_realloc(candidates,
- sizeof(SD_task_t) * candidate_capacity);
- }
-
- /* register the candidate */
- candidates[candidate_nb++] = candidate;
- candidate->fifo_checked = 0;
- }
- }
- }
-
- XBT_DEBUG("Candidates found: %d", candidate_nb);
-
- /* now we check every candidate task */
- for (i = 0; i < candidate_nb; i++) {
- candidate = candidates[i];
-
- if (candidate->fifo_checked) {
- continue; /* we have already evaluated that task */
- }
-
- xbt_assert(SD_task_get_state(candidate) == SD_IN_FIFO,
- "Bad state of candidate '%s': %d",
- SD_task_get_name(candidate), (int)SD_task_get_state(candidate));
-
- for (j = 0; j < candidate->workstation_nb && can_start; j++) {
- workstation = candidate->workstation_list[j];
-
- /* I can start on this workstation if the workstation is shared
- or if I am the first task in the FIFO */
- can_start = sg_host_sd(workstation)->access_mode == SD_WORKSTATION_SHARED_ACCESS
- || candidate ==
- xbt_fifo_get_item_content(xbt_fifo_get_first_item
- (sg_host_sd(workstation)->task_fifo));
- }
-
- XBT_DEBUG("Candidate '%s' can start: %d", SD_task_get_name(candidate),
- can_start);
-
- /* now we are sure that I can start! */
- if (can_start) {
- for (j = 0; j < candidate->workstation_nb && can_start; j++) {
- workstation = candidate->workstation_list[j];
-
- /* update the FIFO */
- if (sg_host_sd(workstation)->access_mode == SD_WORKSTATION_SEQUENTIAL_ACCESS) {
- candidate = (SD_task_t)xbt_fifo_shift(sg_host_sd(workstation)->task_fifo); /* the return value is stored just for debugging */
- XBT_DEBUG("Head of the FIFO: '%s' on workstation %s (%d task left)",
- (candidate !=
- NULL) ? SD_task_get_name(candidate) : "NULL",
- SD_workstation_get_name(workstation),
- xbt_fifo_size(sg_host_sd(workstation)->task_fifo));
- xbt_assert(candidate == candidates[i],
- "Error in __SD_task_just_done: bad first task in the FIFO");
-
- }
- } /* for each workstation */
-
- /* finally execute the task */
- XBT_DEBUG("Task '%s' state: %d", SD_task_get_name(candidate),
- (int)SD_task_get_state(candidate));
- __SD_task_really_run(candidate);
-
- XBT_DEBUG
- ("Calling __SD_task_is_running: task '%s', state set: %d",
- SD_task_get_name(candidate), candidate->state);
- xbt_assert(SD_task_get_state(candidate) == SD_RUNNING,
- "Bad state of task '%s': %d",
- SD_task_get_name(candidate),
- (int)SD_task_get_state(candidate));
- XBT_DEBUG("Okay, the task is running.");
-
- } /* can start */
- candidate->fifo_checked = 1;
- } /* for each candidate */
-
- xbt_free(candidates);
-}
-
/*
* Remove all dependencies associated with a task. This function is called
* when the task is destroyed.
SD_task_get_name(task));
task->flops_amount = xbt_new0(double, ws_count);
task->bytes_amount = xbt_new0(double, ws_count * ws_count);
- xbt_free(task->workstation_list);
- task->workstation_nb = ws_count;
- task->workstation_list = xbt_new0(SD_workstation_t, ws_count);
+ xbt_free(task->host_list);
+ task->host_count = ws_count;
+ task->host_list = xbt_new0(sg_host_t, ws_count);
for(i=0;i<ws_count;i++){
task->flops_amount[i] =
* comm cost alongside to comp one)
*/
void SD_task_schedulev(SD_task_t task, int count,
- const SD_workstation_t * list)
+ const sg_host_t * list)
{
int i, j;
SD_dependency_t dep;
SD_task_distribute_comp_amdahl(task, count);
case SD_TASK_COMM_E2E:
case SD_TASK_COMP_SEQ:
- xbt_assert(task->workstation_nb == count,
+ xbt_assert(task->host_count == count,
"Got %d locations, but were expecting %d locations",
- count,task->workstation_nb);
+ count,task->host_count);
for (i = 0; i < count; i++)
- task->workstation_list[i] = list[i];
+ task->host_list[i] = list[i];
if (SD_task_get_kind(task)== SD_TASK_COMP_SEQ && !task->flops_amount){
/*This task has failed and is rescheduled. Reset the flops_amount*/
task->flops_amount = xbt_new0(double, 1);
if (task->kind == SD_TASK_COMM_E2E) {
XBT_VERB("Schedule comm task %s between %s -> %s. It costs %.f bytes",
SD_task_get_name(task),
- SD_workstation_get_name(task->workstation_list[0]),
- SD_workstation_get_name(task->workstation_list[1]),
+ sg_host_get_name(task->host_list[0]),
+ sg_host_get_name(task->host_list[1]),
task->bytes_amount[2]);
}
if (task->kind == SD_TASK_COMP_SEQ) {
XBT_VERB("Schedule computation task %s on %s. It costs %.f flops",
SD_task_get_name(task),
- SD_workstation_get_name(task->workstation_list[0]),
+ sg_host_get_name(task->host_list[0]),
task->flops_amount[0]);
xbt_dynar_foreach(task->tasks_before, cpt, dep) {
SD_task_t before = dep->src;
if (before->kind == SD_TASK_COMM_E2E) {
- before->workstation_list[1] = task->workstation_list[0];
+ before->host_list[1] = task->host_list[0];
- if (before->workstation_list[0] &&
+ if (before->host_list[0] &&
(SD_task_get_state(before)< SD_SCHEDULED)) {
SD_task_do_schedule(before);
XBT_VERB
("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
SD_task_get_name(before),
- SD_workstation_get_name(before->workstation_list[0]),
- SD_workstation_get_name(before->workstation_list[1]),
+ sg_host_get_name(before->host_list[0]),
+ sg_host_get_name(before->host_list[1]),
before->bytes_amount[2]);
}
}
xbt_dynar_foreach(task->tasks_after, cpt, dep) {
SD_task_t after = dep->dst;
if (after->kind == SD_TASK_COMM_E2E) {
- after->workstation_list[0] = task->workstation_list[0];
- if (after->workstation_list[1]
+ after->host_list[0] = task->host_list[0];
+ if (after->host_list[1]
&& (SD_task_get_state(after)< SD_SCHEDULED)) {
SD_task_do_schedule(after);
XBT_VERB
("Auto-Schedule comm task %s between %s -> %s. It costs %.f bytes",
SD_task_get_name(after),
- SD_workstation_get_name(after->workstation_list[0]),
- SD_workstation_get_name(after->workstation_list[1]),
+ sg_host_get_name(after->host_list[0]),
+ sg_host_get_name(after->host_list[1]),
after->bytes_amount[2]);
}
if (task->kind == SD_TASK_COMP_PAR_AMDAHL) {
XBT_VERB("Schedule computation task %s on %d workstations. %.f flops"
" will be distributed following Amdahl's Law",
- SD_task_get_name(task), task->workstation_nb,
+ SD_task_get_name(task), task->host_count,
task->flops_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){
+ if (!before->host_list){
XBT_VERB("Sender side of Task %s is not scheduled yet",
SD_task_get_name(before));
- before->workstation_list = xbt_new0(SD_workstation_t, count);
- before->workstation_nb = count;
+ before->host_list = xbt_new0(sg_host_t, count);
+ before->host_count = count;
XBT_VERB("Fill the workstation list with list of Task '%s'",
SD_task_get_name(task));
for (i=0;i<count;i++)
- before->workstation_list[i] = task->workstation_list[i];
+ before->host_list[i] = task->host_list[i];
} else {
XBT_VERB("Build communication matrix for task '%s'",
SD_task_get_name(before));
int src_nb, dst_nb;
double src_start, src_end, dst_start, dst_end;
- src_nb = before->workstation_nb;
+ src_nb = before->host_count;
dst_nb = count;
- before->workstation_list = (SD_workstation_t*) xbt_realloc(
- before->workstation_list,
- (before->workstation_nb+count)*sizeof(s_SD_workstation_t));
+ before->host_list = (sg_host_t*) xbt_realloc(
+ before->host_list,
+ (before->host_count+count)*sizeof(sg_host_t));
for(i=0; i<count; i++)
- before->workstation_list[before->workstation_nb+i] =
- task->workstation_list[i];
+ before->host_list[before->host_count+i] =
+ task->host_list[i];
- before->workstation_nb += count;
+ before->host_count += count;
xbt_free(before->flops_amount);
xbt_free(before->bytes_amount);
before->flops_amount = xbt_new0(double,
- before->workstation_nb);
+ before->host_count);
before->bytes_amount = xbt_new0(double,
- before->workstation_nb*
- before->workstation_nb);
+ before->host_count*
+ before->host_count);
for(i=0;i<src_nb;i++){
src_start = i*before->amount/src_nb;
dst_start = j*before->amount/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]),
+ sg_host_get_name(before->host_list[i]),
+ sg_host_get_name(before->host_list[src_nb+j]),
src_start, src_end, dst_start, dst_end);
if ((src_end <= dst_start) || (dst_end <= src_start)) {
before->bytes_amount[i*(src_nb+dst_nb)+src_nb+j]=0.0;
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){
+ if (!after->host_list){
XBT_VERB("Receiver side of Task '%s' is not scheduled yet",
SD_task_get_name(after));
- after->workstation_list = xbt_new0(SD_workstation_t, count);
- after->workstation_nb = count;
+ after->host_list = xbt_new0(sg_host_t, count);
+ after->host_count = count;
XBT_VERB("Fill the workstation list with list of Task '%s'",
SD_task_get_name(task));
for (i=0;i<count;i++)
- after->workstation_list[i] = task->workstation_list[i];
+ after->host_list[i] = task->host_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];
+ dst_nb = after->host_count;
+ after->host_list = (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++)
- after->workstation_list[i] = task->workstation_list[i];
+ after->host_list[i] = task->host_list[i];
- after->workstation_nb += count;
+ after->host_count += count;
xbt_free(after->flops_amount);
xbt_free(after->bytes_amount);
- after->flops_amount = xbt_new0(double, after->workstation_nb);
+ after->flops_amount = xbt_new0(double, after->host_count);
after->bytes_amount = xbt_new0(double,
- after->workstation_nb*
- after->workstation_nb);
+ after->host_count*
+ after->host_count);
for(i=0;i<src_nb;i++){
src_start = i*after->amount/src_nb;
void SD_task_schedulel(SD_task_t task, int count, ...)
{
va_list ap;
- SD_workstation_t *list = xbt_new(SD_workstation_t, count);
+ sg_host_t *list = xbt_new(sg_host_t, count);
int i;
va_start(ap, count);
for (i = 0; i < count; i++) {
- list[i] = va_arg(ap, SD_workstation_t);
+ list[i] = va_arg(ap, sg_host_t);
}
va_end(ap);
SD_task_schedulev(task, count, list);
