X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82bdeeeb1a432be6d7ef85292391a697917855cf..2c5c14ffd2b2af540f201434bd4d32f9c197507f:/src/simdag/sd_dotloader.c diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c index c9c34ce224..9402eaa366 100644 --- a/src/simdag/sd_dotloader.c +++ b/src/simdag/sd_dotloader.c @@ -9,6 +9,8 @@ #include "xbt/misc.h" #include "xbt/log.h" #include +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); @@ -18,6 +20,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); #include #elif HAVE_AGRAPH_H #include +#define agnxtnode(dot, node) agnxtnode(node) +#define agfstin(dot, node) agfstin(node) +#define agnxtin(dot, edge) agnxtin(edge) +#define agfstout(dot, node) agfstout(node) +#define agnxtout(dot, edge) agnxtout(edge) #endif void dot_add_task(Agnode_t * dag_node); @@ -29,15 +36,21 @@ static double dot_parse_double(const char *string) { if (string == NULL) return -1; - int ret = 0; double value = -1; + char *err; - ret = sscanf(string, "%lg", &value); - if (ret != 1) - WARN1("%s is not a double", string); + //ret = sscanf(string, "%lg", &value); + errno = 0; + value = strtod(string,&err); + if(errno) + { + XBT_WARN("Failed to convert string to double: %s\n",strerror(errno)); + return -1; + } return value; } + static int dot_parse_int(const char *string) { if (string == NULL) @@ -47,7 +60,7 @@ static int dot_parse_int(const char *string) ret = sscanf(string, "%d", &value); if (ret != 1) - WARN1("%s is not an integer", string); + XBT_WARN("%s is not an integer", string); return value; } @@ -64,7 +77,7 @@ static void dump_res() unsigned int cursor; SD_task_t task; xbt_dynar_foreach(result, cursor, task) { - INFO1("Task %d", cursor); + XBT_INFO("Task %d", cursor); SD_task_dump(task); } } @@ -76,12 +89,18 @@ static void dot_task_free(void *task) SD_task_destroy(t); } +static void dot_task_p_free(void *task) +{ + SD_task_t *t = task; + SD_task_destroy(*t); +} + static void TRACE_sd_dotloader (SD_task_t task, const char *category) { if (category){ if (strlen (category) != 0){ TRACE_category (category); - TRACE_sd_set_task_category (task, category); + SD_task_set_category (task, category); } } } @@ -138,22 +157,24 @@ xbt_dynar_t SD_dotload_with_sched(const char *filename){ if(acyclic_graph_detail(result)) return result; else - WARN0("There is at least one cycle in the provided task graph"); + XBT_WARN("There is at least one cycle in the provided task graph"); }else{ - WARN0("The scheduling is ignored"); + XBT_WARN("The scheduling is ignored"); } return NULL; } xbt_dynar_t SD_dotload_generic(const char * filename) { - xbt_assert0(filename, "Unable to use a null file descriptor\n"); - dag_dot = agopen((char*)filename,Agstrictdirected,0); - - result = xbt_dynar_new(sizeof(SD_task_t), dot_task_free); - files = xbt_dict_new(); - jobs = xbt_dict_new(); - computers = xbt_dict_new(); + xbt_assert(filename, "Unable to use a null file descriptor\n"); + //dag_dot = agopen((char*)filename,Agstrictdirected,0); + FILE *in_file = fopen(filename, "r"); + dag_dot = agread(in_file, NIL(Agdisc_t *)); + + result = xbt_dynar_new(sizeof(SD_task_t), dot_task_p_free); + files = xbt_dict_new_homogeneous(&dot_task_free); + jobs = xbt_dict_new_homogeneous(NULL); + computers = xbt_dict_new_homogeneous(NULL); root_task = SD_task_create_comp_seq("root", NULL, 0); /* by design the root task is always SCHEDULABLE */ __SD_task_set_state(root_task, SD_SCHEDULABLE); @@ -164,15 +185,8 @@ xbt_dynar_t SD_dotload_generic(const char * filename) xbt_dict_set(jobs, "end", end_task, NULL); Agnode_t *dag_node = NULL; - for (dag_node = agfstnode(dag_dot); dag_node; -#ifdef HAVE_CGRAPH_H - dag_node = agnxtnode(dag_dot, dag_node) -#elif HAVE_AGRAPH_H - dag_node = agnxtnode(dag_node) -#endif - ) { - - dot_add_task(dag_node); + for (dag_node = agfstnode(dag_dot); dag_node; dag_node = agnxtnode(dag_dot, dag_node)) { + dot_add_task(dag_node); } agclose(dag_dot); xbt_dict_free(&jobs); @@ -189,7 +203,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename) unsigned int cpt1, cpt2; SD_task_t newfile = NULL; SD_dependency_t depbefore, depafter; - if (xbt_dynar_length(file->tasks_before) == 0) { + if (xbt_dynar_is_empty(file->tasks_before)) { xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { SD_task_t newfile = SD_task_create_comm_e2e(file->name, NULL, file->amount); @@ -197,7 +211,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename) SD_task_dependency_add(NULL, NULL, newfile, depafter->dst); xbt_dynar_push(result, &newfile); } - } else if (xbt_dynar_length(file->tasks_after) == 0) { + } else if (xbt_dynar_is_empty(file->tasks_after)) { xbt_dynar_foreach(file->tasks_before, cpt2, depbefore) { SD_task_t newfile = SD_task_create_comm_e2e(file->name, NULL, file->amount); @@ -209,7 +223,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename) xbt_dynar_foreach(file->tasks_before, cpt1, depbefore) { xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { if (depbefore->src == depafter->dst) { - WARN2 + XBT_WARN ("File %s is produced and consumed by task %s. This loop dependency will prevent the execution of the task.", file->name, depbefore->src->name); } @@ -228,11 +242,14 @@ xbt_dynar_t SD_dotload_generic(const char * filename) /* Free previous copy of the files */ xbt_dict_free(&files); - if(acyclic_graph_detail(result)) - return result; - acyclic_graph_detail(result); - free(dag_dot); - return NULL; + fclose(in_file); + if (!acyclic_graph_detail(result)) { + XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.", + basename((char*)filename)); + xbt_dynar_free(&result); + /* (result == NULL) here */ + } + return result; } /* dot_add_task create a sd_task and all transfers required for this @@ -244,7 +261,7 @@ void dot_add_task(Agnode_t * dag_node) SD_task_t current_job; double runtime = dot_parse_double(agget(dag_node, (char *) "size")); - DEBUG3("See ", name, + XBT_DEBUG("See ", name, agget(dag_node, (char *) "size"), runtime); current_job = xbt_dict_get_or_null(jobs, name); if (current_job == NULL) { @@ -259,26 +276,15 @@ void dot_add_task(Agnode_t * dag_node) Agedge_t *e; int count = 0; -#ifdef HAVE_CGRAPH_H - for (e = agfstin(dag_dot, dag_node); e; e = agnxtin(dag_dot, e)) -#elif HAVE_AGRAPH_H - for (e = agfstin(dag_node); e; e = agnxtin(e)) -#endif - { - dot_add_input_dependencies(current_job, e); - count++; + for (e = agfstin(dag_dot, dag_node); e; e = agnxtin(dag_dot, e)) { + dot_add_input_dependencies(current_job, e); + count++; } if (count == 0 && current_job != root_task) { SD_task_dependency_add(NULL, NULL, root_task, current_job); } count = 0; -#ifdef HAVE_CGRAPH_H - for (e = agfstout(dag_dot, dag_node); e; e = agnxtout(dag_dot, e)) -#elif HAVE_AGRAPH_H - for (e = agfstout(dag_node); e; e = agnxtout(e)) -#endif - { - + for (e = agfstout(dag_dot, dag_node); e; e = agnxtout(dag_dot, e)) { dot_add_output_dependencies(current_job, e); count++; } @@ -301,7 +307,7 @@ void dot_add_task(Agnode_t * dag_node) if (char_order != NULL) order = (long) dot_parse_int(char_order); xbt_dynar_t computer = NULL; - //INFO2("performer = %d, order=%d",performer,order); + //XBT_INFO("performer = %d, order=%d",performer,order); if(performer != -1 && order != -1){ //necessary parameters are given computer = xbt_dict_get_or_null(computers, char_performer); @@ -309,7 +315,7 @@ void dot_add_task(Agnode_t * dag_node) computer = xbt_dynar_new(sizeof(SD_task_t), NULL); xbt_dict_set(computers, char_performer, computer, NULL); } - if(performer < sd_global->workstation_count){ + if(performer < xbt_lib_length(host_lib)){ // the wanted computer is available SD_task_t *task_test = NULL; if(order < computer->used) @@ -317,7 +323,7 @@ void dot_add_task(Agnode_t * dag_node) if(task_test != NULL && *task_test != NULL && *task_test != current_job){ /*the user gives the same order to several tasks*/ schedule = false; - VERB4("The task %s starts on the computer %s at the position : %s like the task %s", + XBT_VERB("The task %s starts on the computer %s at the position : %s like the task %s", (*task_test)->name, char_performer, char_order, current_job->name); }else{ //the parameter seems to be ok @@ -327,13 +333,13 @@ void dot_add_task(Agnode_t * dag_node) /*the platform has not enough processors to schedule the DAG like *the user wants*/ schedule = false; - VERB0("The schedule is ignored, there are not enough computers"); + XBT_VERB("The schedule is ignored, there are not enough computers"); } } else { //one of necessary parameters are not given schedule = false; - VERB1("The schedule is ignored, the task %s is not correctly schedule", current_job->name); + XBT_VERB("The schedule is ignored, the task %s is not correctly scheduled", current_job->name); } } } @@ -344,12 +350,13 @@ void dot_add_task(Agnode_t * dag_node) * edge. */ void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge) { - SD_task_t file; - - char name[80]; - sprintf(name, "%s->%s", agnameof(agtail(edge)), agnameof(aghead(edge))); + SD_task_t file = NULL; + char *name_tail=agnameof(agtail(edge)); + char *name_head=agnameof(aghead(edge)); + char *name = malloc((strlen(name_head)+strlen(name_tail)+6)*sizeof(char)); + sprintf(name, "%s->%s", name_tail, name_head); double size = dot_parse_double(agget(edge, (char *) "size")); - DEBUG2("size : %e, get size : %s", size, agget(edge, (char *) "size")); + XBT_DEBUG("size : %e, get size : %s", size, agget(edge, (char *) "size")); if (size > 0) { file = xbt_dict_get_or_null(files, name); @@ -358,20 +365,21 @@ void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge) #ifdef HAVE_TRACING TRACE_sd_dotloader (file, agget (edge, (char*)"category")); #endif - xbt_dict_set(files, name, file, &dot_task_free); + xbt_dict_set(files, name, file, NULL); } else { if (SD_task_get_amount(file) != size) { - WARN3("Ignoring file %s size redefinition from %.0f to %.0f", + XBT_WARN("Ignoring file %s size redefinition from %.0f to %.0f", name, SD_task_get_amount(file), size); } } SD_task_dependency_add(NULL, NULL, file, current_job); } else { - file = xbt_dict_get_or_null(jobs, agnameof(agtail(edge))); + file = xbt_dict_get_or_null(jobs, name_tail); if (file != NULL) { SD_task_dependency_add(NULL, NULL, file, current_job); } } + free(name); } /* dot_add_output_dependencies create the dependencies between a @@ -381,10 +389,12 @@ void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge) void dot_add_output_dependencies(SD_task_t current_job, Agedge_t * edge) { SD_task_t file; - char name[80]; - sprintf(name, "%s->%s", agnameof(agtail(edge)), agnameof(aghead(edge))); + char *name_tail=agnameof(agtail(edge)); + char *name_head=agnameof(aghead(edge)); + char *name = malloc((strlen(name_head)+strlen(name_tail)+6)*sizeof(char)); + sprintf(name, "%s->%s", name_tail, name_head); double size = dot_parse_double(agget(edge, (char *) "size")); - DEBUG2("size : %e, get size : %s", size, agget(edge, (char *) "size")); + XBT_DEBUG("size : %e, get size : %s", size, agget(edge, (char *) "size")); if (size > 0) { file = xbt_dict_get_or_null(files, name); @@ -393,21 +403,22 @@ void dot_add_output_dependencies(SD_task_t current_job, Agedge_t * edge) #ifdef HAVE_TRACING TRACE_sd_dotloader (file, agget (edge, (char*)"category")); #endif - xbt_dict_set(files, name, file, &dot_task_free); + xbt_dict_set(files, name, file, NULL); } else { if (SD_task_get_amount(file) != size) { - WARN3("Ignoring file %s size redefinition from %.0f to %.0f", + XBT_WARN("Ignoring file %s size redefinition from %.0f to %.0f", name, SD_task_get_amount(file), size); } } SD_task_dependency_add(NULL, NULL, current_job, file); if (xbt_dynar_length(file->tasks_before) > 1) { - WARN1("File %s created at more than one location...", file->name); + XBT_WARN("File %s created at more than one location...", file->name); } } else { - file = xbt_dict_get_or_null(jobs, agnameof(aghead(edge))); + file = xbt_dict_get_or_null(jobs, name_head); if (file != NULL) { SD_task_dependency_add(NULL, NULL, current_job, file); } } + free(name); }