From aa0d01321f4e20c96c3e3e2e8aa8ffbafd2d6b2b Mon Sep 17 00:00:00 2001 From: Frederic Suter Date: Mon, 25 Jul 2016 09:25:56 +0200 Subject: [PATCH] chase bugs and smells --- src/simdag/sd_daxloader.cpp | 8 +++++--- src/simdag/sd_dotloader.cpp | 14 +++++++++----- src/simdag/sd_workstation.cpp | 9 +++++---- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp index df816747ff..44c32f93d7 100644 --- a/src/simdag/sd_daxloader.cpp +++ b/src/simdag/sd_daxloader.cpp @@ -62,7 +62,8 @@ bool acyclic_graph_detail(xbt_dynar_t dag){ xbt_dynar_t next = nullptr, current = xbt_dynar_new(sizeof(SD_task_t),nullptr); xbt_dynar_foreach(dag,count,task){ - if(task->kind == SD_TASK_COMM_E2E) continue; + if(task->kind == SD_TASK_COMM_E2E) + continue; task->marked = 0; if(task->successors->empty() && task->outputs->empty()) xbt_dynar_push(current, &task); @@ -170,7 +171,8 @@ static xbt_dynar_t result; static xbt_dict_t jobs; static xbt_dict_t files; static SD_task_t current_job; -static SD_task_t root_task, end_task; +static SD_task_t root_task; +static SD_task_t end_task; static void dax_task_free(void *task) { @@ -315,7 +317,7 @@ void STag_dax__uses(void) sd_global->initial_tasks->erase(file); xbt_dict_set(files, A_dax__uses_file, file, nullptr); } else { - if (SD_task_get_amount(file) != size) { + if (file->amount < size || file->amount > size) { XBT_WARN("Ignore file %s size redefinition from %.0f to %.0f", A_dax__uses_file, SD_task_get_amount(file), size); } } diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp index e9ebab0650..2acf99c573 100644 --- a/src/simdag/sd_dotloader.cpp +++ b/src/simdag/sd_dotloader.cpp @@ -109,12 +109,13 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool if((performer != -1 && order != -1) && performer < (int) sg_host_count()){ /* required parameters are given and less performers than hosts are required */ XBT_DEBUG ("Task '%s' is scheduled on workstation '%d' in position '%d'", task->name, performer, order); - if(!(computer = (xbt_dynar_t) xbt_dict_get_or_null(computers, char_performer))){ + computer = static_cast (xbt_dict_get_or_null(computers, char_performer)); + if(computer == nullptr){ computer = xbt_dynar_new(sizeof(SD_task_t), nullptr); xbt_dict_set(computers, char_performer, computer, nullptr); } - if((unsigned int)order < xbt_dynar_length(computer)){ + if(static_cast(order) < xbt_dynar_length(computer)){ SD_task_t *task_test = (SD_task_t *)xbt_dynar_get_ptr(computer,order); if(*task_test && *task_test != task){ /* the user gave the same order to several tasks */ @@ -138,14 +139,16 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool } /*Check if 'root' and 'end' nodes have been explicitly declared. If not, create them. */ - if (!(root = (SD_task_t)xbt_dict_get_or_null(jobs, "root"))) + root = static_cast(xbt_dict_get_or_null(jobs, "root")); + if (root == nullptr) root = (seq_or_par == sequential?SD_task_create_comp_seq("root", nullptr, 0): SD_task_create_comp_par_amdahl("root", nullptr, 0, 0)); SD_task_set_state(root, SD_SCHEDULABLE); /* by design the root task is always SCHEDULABLE */ xbt_dynar_insert_at(result, 0, &root); /* Put it at the beginning of the dynar */ - if (!(end = (SD_task_t)xbt_dict_get_or_null(jobs, "end"))) + end = static_cast(xbt_dict_get_or_null(jobs, "end")); + if (end == nullptr) end = (seq_or_par == sequential?SD_task_create_comp_seq("end", nullptr, 0): SD_task_create_comp_par_amdahl("end", nullptr, 0, 0)); @@ -161,7 +164,8 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool xbt_dynar_sort(edges, edge_compare); xbt_dynar_foreach(edges, i, edge) { - char *src_name=agnameof(agtail(edge)), *dst_name=agnameof(aghead(edge)); + char *src_name=agnameof(agtail(edge)); + char *dst_name=agnameof(aghead(edge)); double size = atof(agget(edge, (char *) "size")); SD_task_t src = static_cast(xbt_dict_get_or_null(jobs, src_name)); diff --git a/src/simdag/sd_workstation.cpp b/src/simdag/sd_workstation.cpp index ceeb8c1334..2973da0d93 100644 --- a/src/simdag/sd_workstation.cpp +++ b/src/simdag/sd_workstation.cpp @@ -25,9 +25,10 @@ SD_link_t *SD_route_get_list(sg_host_t src, sg_host_t dst) int cpt=0; SD_link_t *list = xbt_new(SD_link_t, route->size()); - for (auto link : *route) - list[cpt++] = link; - + for (auto link : *route){ + list[cpt] = link; + cpt++; + } delete route; return list; } @@ -85,7 +86,7 @@ double SD_route_get_bandwidth(sg_host_t src, sg_host_t dst) for (auto link : *route) { double bandwidth = sg_link_bandwidth(link); - if (bandwidth < min_bandwidth || min_bandwidth == -1.0) + if (bandwidth < min_bandwidth || min_bandwidth < 0.0) min_bandwidth = bandwidth; } delete route; -- 2.20.1