X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c55f7a29931df2567c0830e45aa889040e54927c..bff0c1c16b4447b3503aa48d11b15243154ed51a:/src/simdag/sd_dotloader.cpp diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp index 423df637c8..e9ebab0650 100644 --- a/src/simdag/sd_dotloader.cpp +++ b/src/simdag/sd_dotloader.cpp @@ -57,40 +57,42 @@ static int edge_compare(const void *a, const void *b) xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool schedule){ xbt_assert(filename, "Unable to use a null file descriptor\n"); FILE *in_file = fopen(filename, "r"); - xbt_assert(in_file != NULL, "Failed to open file: %s", filename); + xbt_assert(in_file != nullptr, "Failed to open file: %s", filename); unsigned int i; - SD_task_t root, end, task; + SD_task_t root; + SD_task_t end; + SD_task_t task; xbt_dict_t computers; - xbt_dynar_t computer = NULL; + xbt_dynar_t computer = nullptr; xbt_dict_cursor_t dict_cursor; bool schedule_success = true; - xbt_dict_t jobs = xbt_dict_new_homogeneous(NULL); + xbt_dict_t jobs = xbt_dict_new_homogeneous(nullptr); xbt_dynar_t result = xbt_dynar_new(sizeof(SD_task_t), dot_task_p_free); Agraph_t * dag_dot = agread(in_file, NIL(Agdisc_t *)); if (schedule) - computers = xbt_dict_new_homogeneous(NULL); + computers = xbt_dict_new_homogeneous(nullptr); /* Create all the nodes */ - Agnode_t *node = NULL; + Agnode_t *node = nullptr; for (node = agfstnode(dag_dot); node; node = agnxtnode(dag_dot, node)) { char *name = agnameof(node); - double amount = atof(agget(node, (char *) "size")); - - if (!(task = (SD_task_t)xbt_dict_get_or_null(jobs, name))) { + double amount = atof(agget(node, (char*)"size")); + task = static_cast(xbt_dict_get_or_null(jobs, name)); + if (task == nullptr) { if (seq_or_par == sequential){ XBT_DEBUG("See ", name, amount); - task = SD_task_create_comp_seq(name, NULL , amount); + task = SD_task_create_comp_seq(name, nullptr , amount); } else { double alpha = atof(agget(node, (char *) "alpha")); XBT_DEBUG("See ", name, amount, alpha); - task = SD_task_create_comp_par_amdahl(name, NULL , amount, alpha); + task = SD_task_create_comp_par_amdahl(name, nullptr , amount, alpha); } - xbt_dict_set(jobs, name, task, NULL); + xbt_dict_set(jobs, name, task, nullptr); if (strcmp(name,"root") && strcmp(name,"end")) xbt_dynar_push(result, &task); @@ -108,8 +110,8 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool /* 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 = xbt_dynar_new(sizeof(SD_task_t), NULL); - xbt_dict_set(computers, char_performer, computer, NULL); + 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)){ @@ -137,18 +139,18 @@ 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 = (seq_or_par == sequential?SD_task_create_comp_seq("root", NULL, 0): - SD_task_create_comp_par_amdahl("root", NULL, 0, 0)); + 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 = (seq_or_par == sequential?SD_task_create_comp_seq("end", NULL, 0): - SD_task_create_comp_par_amdahl("end", NULL, 0, 0)); + end = (seq_or_par == sequential?SD_task_create_comp_seq("end", nullptr, 0): + SD_task_create_comp_par_amdahl("end", nullptr, 0, 0)); /* Create edges */ - xbt_dynar_t edges = xbt_dynar_new(sizeof(Agedge_t*), NULL); + xbt_dynar_t edges = xbt_dynar_new(sizeof(Agedge_t*), nullptr); for (node = agfstnode(dag_dot); node; node = agnxtnode(dag_dot, node)) { Agedge_t * edge; xbt_dynar_reset(edges); @@ -159,32 +161,31 @@ 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) { - SD_task_t src, dst; char *src_name=agnameof(agtail(edge)), *dst_name=agnameof(aghead(edge)); double size = atof(agget(edge, (char *) "size")); - src = (SD_task_t)xbt_dict_get_or_null(jobs, src_name); - dst = (SD_task_t)xbt_dict_get_or_null(jobs, dst_name); + SD_task_t src = static_cast(xbt_dict_get_or_null(jobs, src_name)); + SD_task_t dst = static_cast(xbt_dict_get_or_null(jobs, dst_name)); if (size > 0) { - char *name = (char*)xbt_malloc((strlen(src_name)+strlen(dst_name)+6)*sizeof(char)); - sprintf(name, "%s->%s", src_name, dst_name); + char *name = bprintf("%s->%s", src_name, dst_name); XBT_DEBUG("See ", name, size); - if (!(task = (SD_task_t)xbt_dict_get_or_null(jobs, name))) { + task = static_cast(xbt_dict_get_or_null(jobs, name)); + if (task == nullptr) { if (seq_or_par == sequential) - task = SD_task_create_comm_e2e(name, NULL , size); + task = SD_task_create_comm_e2e(name, nullptr , size); else - task = SD_task_create_comm_par_mxn_1d_block(name, NULL , size); - SD_task_dependency_add(NULL, NULL, src, task); - SD_task_dependency_add(NULL, NULL, task, dst); - xbt_dict_set(jobs, name, task, NULL); + task = SD_task_create_comm_par_mxn_1d_block(name, nullptr , size); + SD_task_dependency_add(nullptr, nullptr, src, task); + SD_task_dependency_add(nullptr, nullptr, task, dst); + xbt_dict_set(jobs, name, task, nullptr); xbt_dynar_push(result, &task); } else { XBT_WARN("Task '%s' is defined more than once", name); } xbt_free(name); } else { - SD_task_dependency_add(NULL, NULL, src, dst); + SD_task_dependency_add(nullptr, nullptr, src, dst); } } } @@ -195,14 +196,14 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool /* Connect entry tasks to 'root', and exit tasks to 'end'*/ xbt_dynar_foreach (result, i, task){ - if (xbt_dynar_is_empty(task->tasks_before) && task != root) { + if (task->predecessors->empty() && task->inputs->empty() && task != root) { XBT_DEBUG("Task '%s' has no source. Add dependency from 'root'", task->name); - SD_task_dependency_add(NULL, NULL, root, task); + SD_task_dependency_add(nullptr, nullptr, root, task); } - if (xbt_dynar_is_empty(task->tasks_after) && task != end) { + if (task->successors->empty() && task->outputs->empty() && task != end) { XBT_DEBUG("Task '%s' has no destination. Add dependency to 'end'", task->name); - SD_task_dependency_add(NULL, NULL, task, end); + SD_task_dependency_add(nullptr, nullptr, task, end); } } @@ -215,12 +216,12 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool if (schedule_success) { const sg_host_t *workstations = sg_host_list (); xbt_dict_foreach(computers,dict_cursor,computer_name,computer){ - SD_task_t previous_task = NULL; + SD_task_t previous_task = nullptr; xbt_dynar_foreach(computer, i, task){ /* add dependency between the previous and the task to avoid parallel execution */ if(task){ if(previous_task && !SD_task_dependency_exists(previous_task, task)) - SD_task_dependency_add(NULL, NULL, previous_task, task); + SD_task_dependency_add(nullptr, nullptr, previous_task, task); SD_task_schedulel(task, 1, workstations[atoi(computer_name)]); previous_task = task; @@ -235,7 +236,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool xbt_dynar_free(&computer); xbt_dict_free(&computers); xbt_dynar_free(&result); - result = NULL; + result = nullptr; } } @@ -244,7 +245,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base); free(base); xbt_dynar_free(&result); - result = NULL; + result = nullptr; } return result; }