From: Frederic Suter Date: Fri, 24 Mar 2017 10:44:16 +0000 (+0100) Subject: improve that mess a bit X-Git-Tag: v3.16~459 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5b12272a22e8afd0bad1df62c7341bf8ef604fe4?ds=sidebyside improve that mess a bit --- diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp index b112f36348..f74c93e83c 100644 --- a/src/simdag/sd_dotloader.cpp +++ b/src/simdag/sd_dotloader.cpp @@ -1,26 +1,22 @@ -/* Copyright (c) 2009-2016. The SimGrid Team. +/* Copyright (c) 2009-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 "src/internal_config.h" +#include "simdag_private.hpp" #include "simgrid/simdag.h" +#include "src/internal_config.h" #include "xbt/file.h" #include -#include "simdag_private.hpp" +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); #if HAVE_GRAPHVIZ #include -typedef enum { - sequential =0, - parallel -} seq_par_t; - -xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool schedule); +xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool schedule); static void dot_task_p_free(void *task) { SD_task_destroy(*(SD_task_t *)task); @@ -35,25 +31,29 @@ static void dot_task_p_free(void *task) { * If this attribute is ommited, the default value is zero. */ xbt_dynar_t SD_dotload(const char *filename) { - return SD_dotload_generic(filename, sequential, false); + return SD_dotload_generic(filename, true, false); } xbt_dynar_t SD_PTG_dotload(const char * filename) { - return SD_dotload_generic(filename, parallel, false); + return SD_dotload_generic(filename, false, false); } xbt_dynar_t SD_dotload_with_sched(const char *filename) { - return SD_dotload_generic(filename, sequential, true); + return SD_dotload_generic(filename, true, true); } static int edge_compare(const void *a, const void *b) { unsigned va = AGSEQ(*(Agedge_t **)a); unsigned vb = AGSEQ(*(Agedge_t **)b); - return va == vb ? 0 : (va < vb ? -1 : 1); + if (va == vb) + return 0; + else + return (va < vb ? -1 : 1); } -xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool schedule){ +xbt_dynar_t SD_dotload_generic(const char* filename, bool sequential, bool schedule) +{ xbt_assert(filename, "Unable to use a null file descriptor\n"); FILE *in_file = fopen(filename, "r"); xbt_assert(in_file != nullptr, "Failed to open file: %s", filename); @@ -62,27 +62,24 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool SD_task_t root; SD_task_t end; SD_task_t task; - xbt_dict_t computers; xbt_dynar_t computer = nullptr; xbt_dict_cursor_t dict_cursor; bool schedule_success = true; - xbt_dict_t jobs = xbt_dict_new_homogeneous(nullptr); + std::unordered_map jobs; 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(nullptr); + xbt_dict_t computers = xbt_dict_new_homogeneous(nullptr); /* Create all the nodes */ 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")); - task = static_cast(xbt_dict_get_or_null(jobs, name)); - if (task == nullptr) { - if (seq_or_par == sequential){ + if (jobs.find(name) == jobs.end()) { + if (sequential) { XBT_DEBUG("See ", name, amount); task = SD_task_create_comp_seq(name, nullptr , amount); } else { @@ -91,13 +88,13 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool task = SD_task_create_comp_par_amdahl(name, nullptr , amount, alpha); } - xbt_dict_set(jobs, name, task, nullptr); + jobs.insert({std::string(name), task}); if (strcmp(name,"root") && strcmp(name,"end")) xbt_dynar_push(result, &task); - if((seq_or_par == sequential) && - ((schedule && schedule_success) || XBT_LOG_ISENABLED(sd_dotparse, xbt_log_priority_verbose))){ + if ((sequential) && + ((schedule && schedule_success) || XBT_LOG_ISENABLED(sd_dotparse, xbt_log_priority_verbose))) { /* try to take the information to schedule the task only if all is right*/ char *char_performer = agget(node, (char *) "performer"); char *char_order = agget(node, (char *) "order"); @@ -105,7 +102,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool int performer = ((!char_performer || !strcmp(char_performer,"")) ? -1:atoi(char_performer)); int order = ((!char_order || !strcmp(char_order, ""))? -1:atoi(char_order)); - if((performer != -1 && order != -1) && performer < (int) sg_host_count()){ + if ((performer != -1 && order != -1) && performer < static_cast(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); computer = static_cast (xbt_dict_get_or_null(computers, char_performer)); @@ -138,18 +135,20 @@ 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. */ - 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)); + if (jobs.find("root") == jobs.end()) + root = (sequential ? SD_task_create_comp_seq("root", nullptr, 0) + : SD_task_create_comp_par_amdahl("root", nullptr, 0, 0)); + else + root = jobs.at("root"); 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 */ - 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)); + if (jobs.find("end") == jobs.end()) + end = (sequential ? SD_task_create_comp_seq("end", nullptr, 0) + : SD_task_create_comp_par_amdahl("end", nullptr, 0, 0)); + else + end = jobs.at("end"); /* Create edges */ xbt_dynar_t edges = xbt_dynar_new(sizeof(Agedge_t*), nullptr); @@ -167,26 +166,24 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool 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)); - SD_task_t dst = static_cast(xbt_dict_get_or_null(jobs, dst_name)); + SD_task_t src = jobs.at(src_name); + SD_task_t dst = jobs.at(dst_name); if (size > 0) { - char *name = bprintf("%s->%s", src_name, dst_name); - XBT_DEBUG("See ", name, size); - 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, nullptr , size); + std::string name = std::string(src_name) + "->" + dst_name; + XBT_DEBUG("See ", name.c_str(), size); + if (jobs.find(name) == jobs.end()) { + if (sequential) + task = SD_task_create_comm_e2e(name.c_str(), nullptr, size); else - task = SD_task_create_comm_par_mxn_1d_block(name, nullptr , size); + task = SD_task_create_comm_par_mxn_1d_block(name.c_str(), 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); + jobs.insert({name, task}); xbt_dynar_push(result, &task); } else { - XBT_WARN("Task '%s' is defined more than once", name); + XBT_WARN("Task '%s' is defined more than once", name.c_str()); } - xbt_free(name); } else { SD_task_dependency_add(nullptr, nullptr, src, dst); } @@ -211,7 +208,6 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool } agclose(dag_dot); - xbt_dict_free(&jobs); fclose(in_file); if(schedule){ @@ -232,17 +228,17 @@ xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool } xbt_dynar_free(&computer); } - xbt_dict_free(&computers); } else { XBT_WARN("The scheduling is ignored"); xbt_dict_foreach(computers,dict_cursor,computer_name,computer) xbt_dynar_free(&computer); - xbt_dict_free(&computers); xbt_dynar_free(&result); result = nullptr; } } + xbt_dict_free(&computers); + if (result && !acyclic_graph_detail(result)) { char* base = xbt_basename(filename); XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", base);