X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c9915805944cfa61187e82d2139703b99716fbf9..9a10d9dc4c75ef2443ecf56b1ef7cb0720d061b9:/src/simdag/sd_dotloader.c diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c index 13e1b7c949..60b9f7517f 100644 --- a/src/simdag/sd_dotloader.c +++ b/src/simdag/sd_dotloader.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,245 +8,580 @@ #include "simdag/simdag.h" #include "xbt/misc.h" #include "xbt/log.h" +#include +#include +#include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd,"Parsing DOT files"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files"); #undef CLEANUP + +#ifdef HAVE_CGRAPH_H #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 + +typedef enum { + sequential =0, + parallel +} seq_par_t; -static double parse_double(const char *string) { - if (string == NULL) return -10; - int ret = 0; - double value; +void dot_add_task(Agnode_t * dag_node); +void dot_add_parallel_task(Agnode_t * dag_node); +void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge, + seq_par_t seq_or_par); +void dot_add_output_dependencies(SD_task_t current_job, Agedge_t * edge, + seq_par_t seq_or_par); +xbt_dynar_t SD_dotload_generic(const char * filename); - ret = sscanf(string, "%lg", &value); - if (ret != 1) - WARN1("%s is not a double", string); - return value; +static double dot_parse_double(const char *string) +{ + if (string == NULL) + return -1; + double value = -1; + char *err; + + //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 parse_int(const char *string) { - if (string == NULL) return -10; - int ret = 0; - int value; - - ret = sscanf(string, "%d", &value); - if (ret != 1) - WARN1("%s is not an integer", string); - return value; + + +static int dot_parse_int(const char *string) +{ + if (string == NULL) + return -10; + int ret = 0; + int value = -1; + + ret = sscanf(string, "%d", &value); + if (ret != 1) + XBT_WARN("%s is not an integer", string); + return value; } static xbt_dynar_t result; static xbt_dict_t jobs; static xbt_dict_t files; -static SD_task_t root_task,end_task; -static Agraph_t * dag_dot; - -static void dump_res() { - unsigned int cursor; - SD_task_t task; - xbt_dynar_foreach(result,cursor,task) { - INFO1("Task %d",cursor); - SD_task_dump(task); - } +static xbt_dict_t computers; +static SD_task_t root_task, end_task; +static Agraph_t *dag_dot; +static bool schedule = true; + +static void dump_res() +{ + unsigned int cursor; + SD_task_t task; + xbt_dynar_foreach(result, cursor, task) { + XBT_INFO("Task %d", cursor); + SD_task_dump(task); + } +} + + +static void dot_task_free(void *task) +{ + SD_task_t t = task; + SD_task_destroy(t); +} + +static void dot_task_p_free(void *task) +{ + SD_task_t *t = task; + SD_task_destroy(*t); } -static void dot_task_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); + SD_task_set_category (task, category); + } + } } -void Start_dot_job(Agnode_t *dag_node) ; -void input_edge(SD_task_t current_job, Agedge_t *edge) ; -void output_edge(SD_task_t current_job, Agedge_t *edge) ; -/** @brief loads a DAX file describing a DAG +/** @brief loads a DOT file describing a DAG * - * See https://confluence.pegasus.isi.edu/display/pegasus/WorkflowGenerator + * See http://www.graphviz.org/doc/info/lang.html * for more details. + * To obtain information about transfers and tasks, two attributes are + * required : size on task (execution time in Flop) and size on edge + * (the amount of data transfer in bit). + * if they aren't here, there choose to be equal to zero. */ -xbt_dynar_t SD_dotload(const char*filename){ - FILE* in_file = fopen(filename,"r"); - xbt_assert1(in_file, "Unable to open \"%s\"\n", filename); - SD_dotload_FILE(in_file); - fclose(in_file); - return result; +xbt_dynar_t SD_dotload(const char *filename) +{ + SD_dotload_generic(filename); + xbt_dynar_t computer = NULL; + xbt_dict_cursor_t dict_cursor; + char *computer_name; + xbt_dict_foreach(computers,dict_cursor,computer_name,computer){ + xbt_dynar_free(&computer); + } + xbt_dict_free(&computers); + return result; } -xbt_dynar_t SD_dotload_FILE(FILE* in_file){ - xbt_assert0(in_file, "Unable to use a null file descriptor\n"); - dag_dot = agread(in_file,NIL(Agdisc_t*)); +xbt_dynar_t SD_dotload_with_sched(const char *filename){ + SD_dotload_generic(filename); + + if(schedule == true){ + xbt_dynar_t computer = NULL; + xbt_dict_cursor_t dict_cursor; + char *computer_name; + const SD_workstation_t *workstations = SD_workstation_get_list (); + xbt_dict_foreach(computers,dict_cursor,computer_name,computer){ + int count_computer = dot_parse_int(computer_name); + unsigned int count=0; + SD_task_t task; + SD_task_t task_previous = NULL; + xbt_dynar_foreach(computer,count,task){ + // add dependency between the previous and the task to avoid + // parallel execution + if(task != NULL ){ + if(task_previous != NULL && + !SD_task_dependency_exists(task_previous, task)) + SD_task_dependency_add(NULL, NULL, task_previous, task); + SD_task_schedulel(task, 1, workstations[count_computer]); + task_previous = task; + } + } + xbt_dynar_free(&computer); + } + xbt_dict_free(&computers); + if(acyclic_graph_detail(result)) + return result; + else + XBT_WARN("There is at least one cycle in the provided task graph"); + }else{ + XBT_WARN("The scheduling is ignored"); + } + SD_task_t task; + unsigned int count; + xbt_dynar_t computer = NULL; + xbt_dict_cursor_t dict_cursor; + char *computer_name; + xbt_dict_foreach(computers,dict_cursor,computer_name,computer){ + xbt_dynar_free(&computer); + } + xbt_dict_free(&computers); + xbt_dynar_foreach(result,count,task){ + SD_task_destroy(task); + } + return NULL; +} + +xbt_dynar_t SD_PTG_dotload(const char * filename) +{ + xbt_assert(filename, "Unable to use a null file descriptor\n"); + 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_par_amdahl("root", NULL, 0., 0.); + /* by design the root task is always SCHEDULABLE */ + __SD_task_set_state(root_task, SD_SCHEDULABLE); - result = xbt_dynar_new(sizeof(SD_task_t),dot_task_free); - files=xbt_dict_new(); - jobs=xbt_dict_new(); - 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); + xbt_dict_set(jobs, "root", root_task, NULL); + xbt_dynar_push(result, &root_task); + end_task = SD_task_create_comp_par_amdahl("end", NULL, 0., 0.); + xbt_dict_set(jobs, "end", end_task, NULL); - xbt_dynar_push(result,&root_task); - end_task = SD_task_create_comp_seq("end",NULL,0); + Agnode_t *dag_node = NULL; + for (dag_node = agfstnode(dag_dot); dag_node; dag_node = agnxtnode(dag_dot, dag_node)) { + dot_add_parallel_task(dag_node); + } + agclose(dag_dot); + xbt_dict_free(&jobs); - Agnode_t *dag_node = NULL; - for (dag_node = agfstnode(dag_dot); dag_node; dag_node = agnxtnode(dag_dot,dag_node)){ - Start_dot_job(dag_node); + /* And now, post-process the files. + * We want a file task per pair of computation tasks exchanging the file. Duplicate on need + * Files not produced in the system are said to be produced by root task (top of DAG). + * Files not consumed in the system are said to be consumed by end task (bottom of DAG). + */ + xbt_dict_cursor_t cursor; + SD_task_t file; + char *name; + xbt_dict_foreach(files, cursor, name, file) { + unsigned int cpt1, cpt2; + SD_task_t newfile = NULL; + SD_dependency_t depbefore, depafter; + if (xbt_dynar_is_empty(file->tasks_before)) { + xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { + SD_task_t newfile = + SD_task_create_comm_par_mxn_1d_block(file->name, NULL, file->amount); + SD_task_dependency_add(NULL, NULL, root_task, newfile); + SD_task_dependency_add(NULL, NULL, newfile, depafter->dst); + xbt_dynar_push(result, &newfile); + } + } 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_par_mxn_1d_block(file->name, NULL, file->amount); + SD_task_dependency_add(NULL, NULL, depbefore->src, newfile); + SD_task_dependency_add(NULL, NULL, newfile, end_task); + xbt_dynar_push(result, &newfile); + } + } else { + xbt_dynar_foreach(file->tasks_before, cpt1, depbefore) { + xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { + if (depbefore->src == depafter->dst) { + 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); + } + newfile = + SD_task_create_comm_par_mxn_1d_block(file->name, NULL, file->amount); + SD_task_dependency_add(NULL, NULL, depbefore->src, newfile); + SD_task_dependency_add(NULL, NULL, newfile, depafter->dst); + xbt_dynar_push(result, &newfile); + } + } } - agclose(dag_dot); - xbt_dict_free(&jobs); - - /* And now, post-process the files. - * We want a file task per pair of computation tasks exchanging the file. Duplicate on need - * Files not produced in the system are said to be produced by root task (top of DAG). - * Files not consumed in the system are said to be consumed by end task (bottom of DAG). - */ - xbt_dict_cursor_t cursor; - SD_task_t file; - char *name; - xbt_dict_foreach(files,cursor,name,file) { - unsigned int cpt1,cpt2; - SD_task_t newfile = NULL; - SD_dependency_t depbefore,depafter; - if (xbt_dynar_length(file->tasks_before) == 0) { - xbt_dynar_foreach(file->tasks_after,cpt2,depafter) { - SD_task_t newfile = SD_task_create_comm_e2e(file->name,NULL,file->amount); - SD_task_dependency_add(NULL,NULL,root_task,newfile); - SD_task_dependency_add(NULL,NULL,newfile,depafter->dst); - xbt_dynar_push(result,&newfile); - } - } else if (xbt_dynar_length(file->tasks_after) == 0) { - xbt_dynar_foreach(file->tasks_before,cpt2,depbefore) { - SD_task_t newfile = SD_task_create_comm_e2e(file->name,NULL,file->amount); - SD_task_dependency_add(NULL,NULL,depbefore->src,newfile); - SD_task_dependency_add(NULL,NULL,newfile,end_task); - xbt_dynar_push(result,&newfile); - } - } else { - xbt_dynar_foreach(file->tasks_before,cpt1,depbefore) { - xbt_dynar_foreach(file->tasks_after,cpt2,depafter) { - if (depbefore->src == depafter->dst) { - WARN2("File %s is produced and consumed by task %s. This loop dependency will prevent the execution of the task.", - file->name,depbefore->src->name); - } - newfile = SD_task_create_comm_e2e(file->name,NULL,file->amount); - SD_task_dependency_add(NULL,NULL,depbefore->src,newfile); - SD_task_dependency_add(NULL,NULL,newfile,depafter->dst); - xbt_dynar_push(result,&newfile); - } - } + } + + /* Push end task last */ + xbt_dynar_push(result, &end_task); + + /* Free previous copy of the files */ + xbt_dict_free(&files); + xbt_dict_free(&computers); + 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; +} + + +xbt_dynar_t SD_dotload_generic(const char * filename) +{ + 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); + + xbt_dict_set(jobs, "root", root_task, NULL); + xbt_dynar_push(result, &root_task); + end_task = SD_task_create_comp_seq("end", NULL, 0); + xbt_dict_set(jobs, "end", end_task, NULL); + + Agnode_t *dag_node = NULL; + 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); + + /* And now, post-process the files. + * We want a file task per pair of computation tasks exchanging the file. Duplicate on need + * Files not produced in the system are said to be produced by root task (top of DAG). + * Files not consumed in the system are said to be consumed by end task (bottom of DAG). + */ + xbt_dict_cursor_t cursor; + SD_task_t file; + char *name; + xbt_dict_foreach(files, cursor, name, file) { + unsigned int cpt1, cpt2; + SD_task_t newfile = NULL; + SD_dependency_t depbefore, depafter; + 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); + SD_task_dependency_add(NULL, NULL, root_task, newfile); + SD_task_dependency_add(NULL, NULL, newfile, depafter->dst); + xbt_dynar_push(result, &newfile); + } + } 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); + SD_task_dependency_add(NULL, NULL, depbefore->src, newfile); + SD_task_dependency_add(NULL, NULL, newfile, end_task); + xbt_dynar_push(result, &newfile); + } + } else { + xbt_dynar_foreach(file->tasks_before, cpt1, depbefore) { + xbt_dynar_foreach(file->tasks_after, cpt2, depafter) { + if (depbefore->src == depafter->dst) { + 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); + } + newfile = + SD_task_create_comm_e2e(file->name, NULL, file->amount); + SD_task_dependency_add(NULL, NULL, depbefore->src, newfile); + SD_task_dependency_add(NULL, NULL, newfile, depafter->dst); + xbt_dynar_push(result, &newfile); } + } } + } - /* Push end task last */ - xbt_dynar_push(result,&end_task); + /* Push end task last */ + xbt_dynar_push(result, &end_task); - /* Free previous copy of the files */ - xbt_dict_free(&files); + /* Free previous copy of the files */ + xbt_dict_free(&files); + 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; +} - //INFO2("result : %lld, dot : %lld",result,*dot); - return result; +/* dot_add_parallel_task create a sd_task of SD_TASK_COMP_PAR_AMDHAL type and + * all transfers required for this task. The execution time of the task is + * given by the attribute size. The unit of size is the Flop.*/ +void dot_add_parallel_task(Agnode_t * dag_node) +{ + char *name = agnameof(dag_node); + SD_task_t current_job; + double amount = dot_parse_double(agget(dag_node, (char *) "size")); + double alpha = dot_parse_double(agget(dag_node, (char *) "alpha")); + + if (alpha == -1.) + alpha = 0.0; + + XBT_DEBUG("See ", name, + agget(dag_node, (char *) "size"), amount, alpha); + current_job = xbt_dict_get_or_null(jobs, name); + if (current_job == NULL) { + current_job = + SD_task_create_comp_par_amdahl(name, NULL , amount, alpha); +#ifdef HAVE_TRACING + TRACE_sd_dotloader (current_job, agget (dag_node, (char*)"category")); +#endif + xbt_dict_set(jobs, name, current_job, NULL); + xbt_dynar_push(result, ¤t_job); + } + Agedge_t *e; + int count = 0; + + for (e = agfstin(dag_dot, dag_node); e; e = agnxtin(dag_dot, e)) { + dot_add_input_dependencies(current_job, e, parallel); + count++; + } + if (count == 0 && current_job != root_task) { + SD_task_dependency_add(NULL, NULL, root_task, current_job); + } + count = 0; + for (e = agfstout(dag_dot, dag_node); e; e = agnxtout(dag_dot, e)) { + dot_add_output_dependencies(current_job, e, parallel); + count++; + } + if (count == 0 && current_job != end_task) { + SD_task_dependency_add(NULL, NULL, current_job, end_task); + } } -void Start_dot_job(Agnode_t *dag_node) { - char *name = agnameof(dag_node); - double runtime = parse_double(agget(dag_node,(char*)"size")); - long performer = (long)parse_int((char *) agget(dag_node,(char*)"performer")); - INFO3("See ",name,agget(dag_node,(char*)"size"),runtime); - SD_task_t current_job = SD_task_create_comp_seq(name,(void*)performer,runtime); - xbt_dict_set(jobs,name,current_job,NULL); - xbt_dynar_push(result,¤t_job); - Agedge_t *e; - int count = 0; - for (e = agfstin(dag_dot,dag_node); e; e = agnxtin(dag_dot,e)) { - input_edge(current_job,e); - count++; - } - if (count==0){ - SD_task_t file; - char *name= (char*)"root->many"; - double size = 0; - - file = xbt_dict_get_or_null(files,name); - if (file==NULL) { - file = SD_task_create_comm_e2e(name,NULL,size); - xbt_dict_set(files,name,file,&dot_task_free); - } else { - if (SD_task_get_amount(file)!=size) { - WARN3("Ignoring file %s size redefinition from %.0f to %.0f", - name,SD_task_get_amount(file),size); - } +/* dot_add_task create a sd_task and all transfers required for this + * task. The execution time of the task is given by the attribute size. + * The unit of size is the Flop.*/ +void dot_add_task(Agnode_t * dag_node) +{ + char *name = agnameof(dag_node); + SD_task_t current_job; + double runtime = dot_parse_double(agget(dag_node, (char *) "size")); + + XBT_DEBUG("See ", name, + agget(dag_node, (char *) "size"), runtime); + current_job = xbt_dict_get_or_null(jobs, name); + if (current_job == NULL) { + current_job = + SD_task_create_comp_seq(name, NULL , runtime); +#ifdef HAVE_TRACING + TRACE_sd_dotloader (current_job, agget (dag_node, (char*)"category")); +#endif + xbt_dict_set(jobs, name, current_job, NULL); + xbt_dynar_push(result, ¤t_job); + } + Agedge_t *e; + int count = 0; + + for (e = agfstin(dag_dot, dag_node); e; e = agnxtin(dag_dot, e)) { + dot_add_input_dependencies(current_job, e, sequential); + count++; + } + if (count == 0 && current_job != root_task) { + SD_task_dependency_add(NULL, NULL, root_task, current_job); + } + count = 0; + for (e = agfstout(dag_dot, dag_node); e; e = agnxtout(dag_dot, e)) { + dot_add_output_dependencies(current_job, e, sequential); + count++; + } + if (count == 0 && current_job != end_task) { + SD_task_dependency_add(NULL, NULL, current_job, end_task); + } + + if(schedule || XBT_LOG_ISENABLED(sd_dotparse, xbt_log_priority_verbose)){ + /* try to take the information to schedule the task only if all is + * right*/ + // performer is the computer which execute the task + unsigned long performer = -1; + char * char_performer = agget(dag_node, (char *) "performer"); + if (char_performer != NULL) + performer = (long) dot_parse_int(char_performer); + + // order is giving the task order on one computer + unsigned long order = -1; + char * char_order = agget(dag_node, (char *) "order"); + if (char_order != NULL) + order = (long) dot_parse_int(char_order); + xbt_dynar_t computer = NULL; + //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); + if(computer == NULL){ + computer = xbt_dynar_new(sizeof(SD_task_t), NULL); + xbt_dict_set(computers, char_performer, computer, NULL); + } + if(performer < xbt_lib_length(host_lib)){ + // the wanted computer is available + SD_task_t *task_test = NULL; + if(order < computer->used) + task_test = xbt_dynar_get_ptr(computer,order); + if(task_test != NULL && *task_test != NULL && *task_test != current_job){ + /*the user gives the same order to several tasks*/ + schedule = false; + 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 + xbt_dynar_set_as(computer, order, SD_task_t, current_job); } - SD_task_dependency_add(NULL,NULL,file,current_job); - } - count = 0; - for (e = agfstout(dag_dot,dag_node); e; e = agnxtout(dag_dot,e)) { - output_edge(current_job,e); - count++; + }else{ + /*the platform has not enough processors to schedule the DAG like + *the user wants*/ + schedule = false; + XBT_VERB("The schedule is ignored, there are not enough computers"); + } } - if (count==0){ - SD_task_t file; - char *name = (char*)"many->end"; - double size = 0; - - // INFO2("See ",A_dot__uses_file,(is_input?"in":"out")); - file = xbt_dict_get_or_null(files,name); - if (file==NULL) { - file = SD_task_create_comm_e2e(name,NULL,size); - xbt_dict_set(files,name,file,&dot_task_free); - } else { - if (SD_task_get_amount(file)!=size) { - WARN3("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); - } + else { + //one of necessary parameters are not given + schedule = false; + XBT_VERB("The schedule is ignored, the task %s is not correctly scheduled", current_job->name); } + } } -void input_edge(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))); - double size = parse_double(agget(edge,(char*)"size")); - //int sender = parse_int(agget(edge,(char*)"sender")); - //int reciever = parse_int(agget(edge,(char*)"reciever")); +/* dot_add_output_dependencies create the dependencies between a task + * and a transfers. This is given by the edges in the dot file. + * The amount of data transfers is given by the attribute size on the + * edge. */ +void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge, + seq_par_t seq_or_par) +{ + SD_task_t file = NULL; + char *name_tail=agnameof(agtail(edge)); + char *name_head=agnameof(aghead(edge)); + char *name = xbt_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")); + XBT_DEBUG("size : %e, get size : %s", size, agget(edge, (char *) "size")); - file = xbt_dict_get_or_null(files,name); - if (file==NULL) { - file = SD_task_create_comm_e2e(name,NULL,size); - xbt_dict_set(files,name,file,&dot_task_free); + if (size > 0) { + file = xbt_dict_get_or_null(files, name); + if (file == NULL) { + if (seq_or_par == sequential){ + file = SD_task_create_comm_e2e(name, NULL, size); + } else { + file = SD_task_create_comm_par_mxn_1d_block(name, NULL, size); + } +#ifdef HAVE_TRACING + TRACE_sd_dotloader (file, agget (edge, (char*)"category")); +#endif + 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", - name,SD_task_get_amount(file),size); - } + if (SD_task_get_amount(file) != size) { + 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, name_tail); + if (file != NULL) { + SD_task_dependency_add(NULL, NULL, file, current_job); } - SD_task_dependency_add(NULL,NULL,file,current_job); + } + free(name); } -void output_edge(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))); - double size = parse_double(agget(edge,(char*)"size")); - //int sender = parse_int(agget(edge,(char*)"sender")); - //int reciever = parse_int(agget(edge,(char*)"reciever")); - - //INFO2("See ",A_dot__uses_file,(is_input?"in":"out")); - file = xbt_dict_get_or_null(files,name); - if (file==NULL) { - file = SD_task_create_comm_e2e(name,NULL,size); - xbt_dict_set(files,name,file,&dot_task_free); +/* dot_add_output_dependencies create the dependencies between a + * transfers and a task. This is given by the edges in the dot file. + * The amount of data transfers is given by the attribute size on the + * edge. */ +void dot_add_output_dependencies(SD_task_t current_job, Agedge_t * edge, + seq_par_t seq_or_par){ + SD_task_t file; + char *name_tail=agnameof(agtail(edge)); + char *name_head=agnameof(aghead(edge)); + char *name = xbt_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")); + XBT_DEBUG("size : %e, get size : %s", size, agget(edge, (char *) "size")); + + if (size > 0) { + file = xbt_dict_get_or_null(files, name); + if (file == NULL) { + if (seq_or_par == sequential){ + file = SD_task_create_comm_e2e(name, NULL, size); + } else { + file = SD_task_create_comm_par_mxn_1d_block(name, NULL, size); + } +#ifdef HAVE_TRACING + TRACE_sd_dotloader (file, agget (edge, (char*)"category")); +#endif + 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", - name,SD_task_get_amount(file),size); - } + if (SD_task_get_amount(file) != size) { + 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) { + XBT_WARN("File %s created at more than one location...", file->name); } - 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); + } else { + file = xbt_dict_get_or_null(jobs, name_head); + if (file != NULL) { + SD_task_dependency_add(NULL, NULL, current_job, file); } + } + free(name); } -