X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9075e66a697269a01d657f67d684a8d63627d124..c82612f115c9741b134e7cba11e28bb706acacd7:/src/simdag/sd_task.cpp diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index 8723e1e333..84b9b74997 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -1,12 +1,13 @@ -/* Copyright (c) 2006-2016. The SimGrid Team. +/* Copyright (c) 2006-2017. The SimGrid Team. * All rights reserved. */ /* 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 "simdag_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/surf_interface.hpp" -#include "src/simdag/simdag_private.h" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_task, sd, "Logging specific to SimDag (task)"); @@ -22,7 +23,6 @@ static void __SD_task_destroy_scheduling_data(SD_task_t task) task->flops_amount = nullptr; } - /** * \brief Creates a new task. * @@ -34,7 +34,6 @@ static void __SD_task_destroy_scheduling_data(SD_task_t task) */ SD_task_t SD_task_create(const char *name, void *data, double amount) { - //SD_task_t task = static_cast(xbt_mallocator_get(sd_global->task_mallocator)); SD_task_t task = xbt_new0(s_SD_task_t, 1); task->kind = SD_TASK_NOT_TYPED; task->state= SD_NOT_SCHEDULED; @@ -135,7 +134,7 @@ SD_task_t SD_task_create_comp_par_amdahl(const char *name, void *data, double fl /** @brief create a complex data redistribution task that can then be auto-scheduled * - * Auto-scheduling mean that the task can be used with SD_task_schedulev(). + * Auto-scheduling mean that the task can be used with SD_task_schedulev(). * This allows to specify the task costs at creation, and decouple them from the scheduling process where you just * specify which resource should communicate. * @@ -168,14 +167,14 @@ void SD_task_destroy(SD_task_t task) XBT_DEBUG("Destroying task %s...", SD_task_get_name(task)); /* First Remove all dependencies associated with the task. */ - while (!task->predecessors->empty()) + while (not task->predecessors->empty()) SD_task_dependency_remove(*(task->predecessors->begin()), task); - while (!task->inputs->empty()) + while (not task->inputs->empty()) SD_task_dependency_remove(*(task->inputs->begin()), task); - while (!task->successors->empty()) + while (not task->successors->empty()) SD_task_dependency_remove(task, *(task->successors->begin())); - while (!task->outputs->empty()) - SD_task_dependency_remove(task, *(task->outputs->begin())); + while (not task->outputs->empty()) + SD_task_dependency_remove(task, *(task->outputs->begin())); if (task->state == SD_SCHEDULED || task->state == SD_RUNNABLE) __SD_task_destroy_scheduling_data(task); @@ -291,7 +290,7 @@ void SD_task_set_state(SD_task_t task, e_SD_task_state_t new_state) task->start_time = task->surf_action->getStartTime(); if (new_state == SD_DONE){ task->finish_time = task->surf_action->getFinishTime(); -#if HAVE_JEDULE +#if SIMGRID_HAVE_JEDULE jedule_log_sd_event(task); #endif } else @@ -338,9 +337,9 @@ xbt_dynar_t SD_task_get_parents(SD_task_t task) { xbt_dynar_t parents = xbt_dynar_new(sizeof(SD_task_t), nullptr); - for (auto it : *task->predecessors) + for (auto const& it : *task->predecessors) xbt_dynar_push(parents, &it); - for (auto it : *task->inputs) + for (auto const& it : *task->inputs) xbt_dynar_push(parents, &it); return parents; @@ -355,9 +354,9 @@ xbt_dynar_t SD_task_get_children(SD_task_t task) { xbt_dynar_t children = xbt_dynar_new(sizeof(SD_task_t), nullptr); - for (auto it : *task->successors) + for (auto const& it : *task->successors) xbt_dynar_push(children, &it); - for (auto it : *task->outputs) + for (auto const& it : *task->outputs) xbt_dynar_push(children, &it); return children; @@ -382,7 +381,7 @@ int SD_task_get_workstation_count(SD_task_t task) */ sg_host_t *SD_task_get_workstation_list(SD_task_t task) { - return &(*(task->allocation))[0]; + return task->allocation->data(); } /** @@ -450,16 +449,12 @@ e_SD_task_kind_t SD_task_get_kind(SD_task_t task) void SD_task_dump(SD_task_t task) { XBT_INFO("Displaying task %s", SD_task_get_name(task)); - char *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_RUNNING ? " running" : ""), - (task->state == SD_DONE ? " done" : ""), - (task->state == SD_FAILED ? " failed" : "")); - XBT_INFO(" - state:%s", statename); - free(statename); + if (task->state == SD_RUNNABLE) + XBT_INFO(" - state: runnable"); + else if (task->state < SD_RUNNABLE) + XBT_INFO(" - state: %s not runnable", __get_state_name(task->state)); + else + XBT_INFO(" - state: not runnable %s", __get_state_name(task->state)); if (task->kind != 0) { switch (task->kind) { @@ -486,18 +481,18 @@ void SD_task_dump(SD_task_t task) XBT_INFO(" - Dependencies to satisfy: %zu", task->inputs->size()+ task->predecessors->size()); if ((task->inputs->size()+ task->predecessors->size()) > 0) { XBT_INFO(" - pre-dependencies:"); - for (auto it : *task->predecessors) + for (auto const& it : *task->predecessors) XBT_INFO(" %s", it->name); - for (auto it: *task->inputs) + for (auto const& it : *task->inputs) XBT_INFO(" %s", it->name); } if ((task->outputs->size() + task->successors->size()) > 0) { XBT_INFO(" - post-dependencies:"); - for (auto it : *task->successors) + for (auto const& it : *task->successors) XBT_INFO(" %s", it->name); - for (auto it : *task->outputs) + for (auto const& it : *task->outputs) XBT_INFO(" %s", it->name); } } @@ -520,9 +515,9 @@ void SD_task_dotty(SD_task_t task, void *out) xbt_die("Unknown task type!"); } fprintf(fout, "];\n"); - for (auto it : *task->predecessors) + for (auto const& it : *task->predecessors) fprintf(fout, " T%p -> T%p;\n", it, task); - for (auto it : *task->inputs) + for (auto const& it : *task->inputs) fprintf(fout, " T%p -> T%p;\n", it, task); } @@ -691,13 +686,13 @@ double SD_task_get_execution_time(SD_task_t task, int host_count, const sg_host_ for (int i = 0; i < host_count; i++) { double time = 0.0; if (flops_amount != nullptr) - time = flops_amount[i] / host_list[i]->speed(); + time = flops_amount[i] / host_list[i]->getSpeed(); if (bytes_amount != nullptr) for (int j = 0; j < host_count; j++) if (bytes_amount[i * host_count + j] != 0) - time += (SD_route_get_latency(host_list[i], host_list[j]) + - bytes_amount[i * host_count + j] / SD_route_get_bandwidth(host_list[i], host_list[j])); + time += (sg_host_route_latency(host_list[i], host_list[j]) + + bytes_amount[i * host_count + j] / sg_host_route_bandwidth(host_list[i], host_list[j])); if (time > max_time) max_time = time; @@ -724,7 +719,7 @@ static inline void SD_task_do_schedule(SD_task_t task) * * \param task the task you want to schedule * \param host_count number of hosts on which the task will be executed - * \param workstation_list the hosts on which the task will be executed + * \param host_list the hosts on which the task will be executed * \param flops_amount computation amount for each hosts (i.e., an array of host_count doubles) * \param bytes_amount communication amount between each pair of hosts (i.e., a matrix of host_count*host_count doubles) * \param rate task execution speed rate @@ -804,18 +799,16 @@ void SD_task_run(SD_task_t task) /* Copy the elements of the task into the action */ int host_nb = task->allocation->size(); - sg_host_t *hosts = xbt_new(sg_host_t, host_nb); - int i =0; - for (auto host: *task->allocation) - hosts[i++] = host; + sg_host_t* hosts = new sg_host_t[host_nb]; + std::copy_n(task->allocation->begin(), host_nb, hosts); - double *flops_amount = xbt_new0(double, host_nb); - double *bytes_amount = xbt_new0(double, host_nb * host_nb); + double* flops_amount = new double[host_nb](); + double* bytes_amount = new double[host_nb * host_nb](); if(task->flops_amount) - memcpy(flops_amount, task->flops_amount, sizeof(double) * host_nb); + std::copy_n(task->flops_amount, host_nb, flops_amount); if(task->bytes_amount) - memcpy(bytes_amount, task->bytes_amount, sizeof(double) * host_nb * host_nb); + std::copy_n(task->bytes_amount, host_nb * host_nb, bytes_amount); task->surf_action = surf_host_model->executeParallelTask(host_nb, hosts, flops_amount, bytes_amount, task->rate); @@ -825,7 +818,7 @@ void SD_task_run(SD_task_t task) __SD_task_destroy_scheduling_data(task); /* now the scheduling data are not useful anymore */ SD_task_set_state(task, SD_RUNNING); - xbt_dynar_push(sd_global->return_set, &task); + sd_global->return_set->insert(task); } /** @@ -915,7 +908,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) XBT_VERB("Schedule computation task %s on %zu host(s)", task->name, task->allocation->size()); if (task->kind == SD_TASK_COMP_SEQ) { - if (!task->flops_amount){ /*This task has failed and is rescheduled. Reset the flops_amount*/ + if (not task->flops_amount) { /*This task has failed and is rescheduled. Reset the flops_amount*/ task->flops_amount = xbt_new0(double, 1); task->flops_amount[0] = task->amount; } @@ -930,7 +923,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) SD_task_do_schedule(task); /* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */ - for (auto input : *task->inputs){ + for (auto const& input : *task->inputs) { int src_nb = input->allocation->size(); int dst_nb = count; if (input->allocation->empty()) @@ -949,7 +942,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) } } - for (auto output : *task->outputs){ + for (auto const& output : *task->outputs) { int src_nb = count; int dst_nb = output->allocation->size(); if (output->allocation->empty()) @@ -977,12 +970,12 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) void SD_task_schedulel(SD_task_t task, int count, ...) { va_list ap; - sg_host_t *list = xbt_new(sg_host_t, count); + sg_host_t* list = new sg_host_t[count]; va_start(ap, count); for (int i=0; i