X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b..a2d16cd78c8d1a779948aa69d6e396028c788a5e:/src/simdag/sd_task.cpp diff --git a/src/simdag/sd_task.cpp b/src/simdag/sd_task.cpp index 4bde0b8dc3..43b1489ead 100644 --- a/src/simdag/sd_task.cpp +++ b/src/simdag/sd_task.cpp @@ -40,7 +40,7 @@ SD_task_t SD_task_create(const char *name, void *data, double amount) task->state= SD_NOT_SCHEDULED; sd_global->initial_tasks.insert(task); - task->marked = 0; + task->marked = false; task->start_time = -1.0; task->finish_time = -1.0; task->surf_action = nullptr; @@ -67,7 +67,7 @@ static inline SD_task_t SD_task_create_sized(const char *name, void *data, doubl return task; } -/** @brief create a end-to-end communication task that can then be auto-scheduled +/** @brief create an end-to-end communication task that can then be auto-scheduled * * Auto-scheduling mean that the task can be used with SD_task_schedulev(). This allows one to specify the task costs at * creation, and decouple them from the scheduling process where you just specify which resource should deliver the @@ -371,7 +371,7 @@ xbt_dynar_t SD_task_get_children(const_SD_task_t task) */ int SD_task_get_workstation_count(const_SD_task_t task) { - return task->allocation->size(); + return static_cast(task->allocation->size()); } /** @@ -501,7 +501,7 @@ void SD_task_dump(const_SD_task_t task) /** @brief Dumps the task in dotty formalism into the FILE* passed as second argument */ void SD_task_dotty(const_SD_task_t task, void* out) { - FILE *fout = static_cast(out); + auto* fout = static_cast(out); fprintf(fout, " T%p [label=\"%.20s\"", task, task->name); switch (task->kind) { case SD_TASK_COMM_E2E: @@ -591,10 +591,10 @@ int SD_task_dependency_exists(const_SD_task_t src, SD_task_t dst) if (dst) { return (src->successors->find(dst) != src->successors->end() || src->outputs->find(dst) != src->outputs->end()); } else { - return src->successors->size() + src->outputs->size(); + return static_cast(src->successors->size() + src->outputs->size()); } } else { - return dst->predecessors->size() + dst->inputs->size(); + return static_cast(dst->predecessors->size() + dst->inputs->size()); } } @@ -691,8 +691,8 @@ double SD_task_get_execution_time(const_SD_task_t /*task*/, int host_count, cons if (bytes_amount != nullptr) for (int j = 0; j < host_count; j++) if (bytes_amount[i * host_count + j] != 0) - 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])); + time += (sg_host_get_route_latency(host_list[i], host_list[j]) + + bytes_amount[i * host_count + j] / sg_host_get_route_bandwidth(host_list[i], host_list[j])); if (time > max_time) max_time = time; @@ -916,7 +916,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) /* Iterate over all inputs and outputs to say where I am located (and start them if runnable) */ for (auto const& input : *task->inputs) { - int src_nb = input->allocation->size(); + int src_nb = static_cast(input->allocation->size()); int dst_nb = count; if (input->allocation->empty()) XBT_VERB("Sender side of '%s' not scheduled. Set receiver side to '%s''s allocation", input->name, task->name); @@ -936,7 +936,7 @@ void SD_task_schedulev(SD_task_t task, int count, const sg_host_t * list) for (auto const& output : *task->outputs) { int src_nb = count; - int dst_nb = output->allocation->size(); + int dst_nb = static_cast(output->allocation->size()); if (output->allocation->empty()) XBT_VERB("Receiver side of '%s' not scheduled. Set sender side to '%s''s allocation", output->name, task->name); @@ -962,7 +962,7 @@ 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 = new sg_host_t[count]; + auto* list = new sg_host_t[count]; va_start(ap, count); for (int i=0; i