From: quintin Date: Mon, 5 Jul 2010 07:56:11 +0000 (+0000) Subject: correction to compile with warning and th indentation in my files X-Git-Tag: v3_5~854 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c9915805944cfa61187e82d2139703b99716fbf9 correction to compile with warning and th indentation in my files git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7963 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/examples/simdag/dot/dot_test.c b/examples/simdag/dot/dot_test.c index 2d72a6c88f..c54aece092 100644 --- a/examples/simdag/dot/dot_test.c +++ b/examples/simdag/dot/dot_test.c @@ -14,111 +14,111 @@ #include XBT_LOG_NEW_DEFAULT_CATEGORY(test, - "Logging specific to this SimDag example"); + "Logging specific to this SimDag example"); static int name_compare_hosts(const void *n1, const void *n2) { - char name1[80], name2[80]; - strcpy(name1, SD_workstation_get_name(*((SD_workstation_t *) n1))); - strcpy(name2, SD_workstation_get_name(*((SD_workstation_t *) n2))); + char name1[80], name2[80]; + strcpy(name1, SD_workstation_get_name(*((SD_workstation_t *) n1))); + strcpy(name2, SD_workstation_get_name(*((SD_workstation_t *) n2))); - return strcmp(name1, name2); + return strcmp(name1, name2); } int main(int argc, char **argv) { - xbt_dynar_t dot, changed; - unsigned int cursor; - SD_task_t task; - - /* initialisation of SD */ - SD_init(&argc, argv); - - /* Check our arguments */ - if (argc < 3) { - INFO1("Usage: %s platform_file dot_file [trace_file]", argv[0]); - INFO1("example: %s ../sd_platform.xml Montage_50.xml Montage_50.mytrace", argv[0]); - exit(1); - } - char *tracefilename; - if (argc == 3) { - char *last=strrchr(argv[2],'.'); - - tracefilename=bprintf("%.*s.trace",(int)(last==NULL?strlen(argv[2]):last-argv[2]),argv[2]); - } else { - tracefilename = xbt_strdup(argv[3]); - } - - /* creation of the environment */ - SD_create_environment(argv[1]); - - /* load the DAX file */ - dot=SD_dotload(argv[2]); - - /* Display all the tasks */ - INFO0("------------------- Display all tasks of the loaded DAG ---------------------------"); - xbt_dynar_foreach(dot,cursor,task) { - SD_task_dump(task); - } - - FILE *dotout = fopen("dot.dot","w"); - fprintf(dotout,"digraph A {\n"); - xbt_dynar_foreach(dot,cursor,task) { - SD_task_dotty(task,dotout); - } - fprintf(dotout,"}\n"); - fclose(dotout); - - /* Schedule them all on the first workstation */ - INFO0("------------------- Schedule tasks ---------------------------"); - const SD_workstation_t *ws_list = SD_workstation_get_list(); - int totalHosts = SD_workstation_get_number(); - qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t), - name_compare_hosts); - - int count = SD_workstation_get_number(); - xbt_dynar_foreach(dot,cursor,task) { - if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) { - if (!strcmp(SD_task_get_name(task),"end")) - SD_task_schedulel(task,1,ws_list[0]); - else - SD_task_schedulel(task,1,ws_list[cursor%count]); - } - } - - INFO0("------------------- Run the schedule ---------------------------"); - changed = SD_simulate(-1); - xbt_dynar_free_container(&changed); - INFO0("------------------- Produce the trace file---------------------------"); - INFO1("Producing the trace of the run into %s",tracefilename); - FILE*out = fopen(tracefilename,"w"); - xbt_assert1(out,"Cannot write to %s",tracefilename); - free(tracefilename); - - xbt_dynar_foreach(dot,cursor,task) { - int kind = SD_task_get_kind(task); - SD_workstation_t *wsl = SD_task_get_workstation_list(task); - switch (kind) { - case SD_TASK_COMP_SEQ: - fprintf(out,"[%f] %s compute %f # %s\n",SD_task_get_start_time(task), - SD_workstation_get_name(wsl[0]),SD_task_get_amount(task), - SD_task_get_name(task)); - break; - case SD_TASK_COMM_E2E: - fprintf(out,"[%f] %s send %s %f # %s\n",SD_task_get_start_time(task), - SD_workstation_get_name(wsl[0]),SD_workstation_get_name(wsl[1]), - SD_task_get_amount(task), SD_task_get_name(task)); - fprintf(out,"[%f] %s recv %s %f # %s\n",SD_task_get_finish_time(task), - SD_workstation_get_name(wsl[1]),SD_workstation_get_name(wsl[0]), - SD_task_get_amount(task), SD_task_get_name(task)); - break; - default: - xbt_die(bprintf("Task %s is of unknown kind %d",SD_task_get_name(task),SD_task_get_kind(task))); - } - SD_task_destroy(task); - } - fclose(out); - - /* exit */ - SD_exit(); - return 0; + xbt_dynar_t dot, changed; + unsigned int cursor; + SD_task_t task; + + /* initialisation of SD */ + SD_init(&argc, argv); + + /* Check our arguments */ + if (argc < 3) { + INFO1("Usage: %s platform_file dot_file [trace_file]", argv[0]); + INFO1("example: %s ../sd_platform.xml Montage_50.xml Montage_50.mytrace", argv[0]); + exit(1); + } + char *tracefilename; + if (argc == 3) { + char *last=strrchr(argv[2],'.'); + + tracefilename=bprintf("%.*s.trace",(int)(last==NULL?strlen(argv[2]):last-argv[2]),argv[2]); + } else { + tracefilename = xbt_strdup(argv[3]); + } + + /* creation of the environment */ + SD_create_environment(argv[1]); + + /* load the DAX file */ + dot=SD_dotload(argv[2]); + + /* Display all the tasks */ + INFO0("------------------- Display all tasks of the loaded DAG ---------------------------"); + xbt_dynar_foreach(dot,cursor,task) { + SD_task_dump(task); + } + + FILE *dotout = fopen("dot.dot","w"); + fprintf(dotout,"digraph A {\n"); + xbt_dynar_foreach(dot,cursor,task) { + SD_task_dotty(task,dotout); + } + fprintf(dotout,"}\n"); + fclose(dotout); + + /* Schedule them all on the first workstation */ + INFO0("------------------- Schedule tasks ---------------------------"); + const SD_workstation_t *ws_list = SD_workstation_get_list(); + int totalHosts = SD_workstation_get_number(); + qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t), + name_compare_hosts); + + int count = SD_workstation_get_number(); + xbt_dynar_foreach(dot,cursor,task) { + if (SD_task_get_kind(task) == SD_TASK_COMP_SEQ) { + if (!strcmp(SD_task_get_name(task),"end")) + SD_task_schedulel(task,1,ws_list[0]); + else + SD_task_schedulel(task,1,ws_list[cursor%count]); + } + } + + INFO0("------------------- Run the schedule ---------------------------"); + changed = SD_simulate(-1); + xbt_dynar_free_container(&changed); + INFO0("------------------- Produce the trace file---------------------------"); + INFO1("Producing the trace of the run into %s",tracefilename); + FILE*out = fopen(tracefilename,"w"); + xbt_assert1(out,"Cannot write to %s",tracefilename); + free(tracefilename); + + xbt_dynar_foreach(dot,cursor,task) { + int kind = SD_task_get_kind(task); + SD_workstation_t *wsl = SD_task_get_workstation_list(task); + switch (kind) { + case SD_TASK_COMP_SEQ: + fprintf(out,"[%f] %s compute %f # %s\n",SD_task_get_start_time(task), + SD_workstation_get_name(wsl[0]),SD_task_get_amount(task), + SD_task_get_name(task)); + break; + case SD_TASK_COMM_E2E: + fprintf(out,"[%f] %s send %s %f # %s\n",SD_task_get_start_time(task), + SD_workstation_get_name(wsl[0]),SD_workstation_get_name(wsl[1]), + SD_task_get_amount(task), SD_task_get_name(task)); + fprintf(out,"[%f] %s recv %s %f # %s\n",SD_task_get_finish_time(task), + SD_workstation_get_name(wsl[1]),SD_workstation_get_name(wsl[0]), + SD_task_get_amount(task), SD_task_get_name(task)); + break; + default: + xbt_die(bprintf("Task %s is of unknown kind %d",SD_task_get_name(task),SD_task_get_kind(task))); + } + SD_task_destroy(task); + } + fclose(out); + + /* exit */ + SD_exit(); + return 0; } diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c index fff2e1176b..13e1b7c949 100644 --- a/src/simdag/sd_dotloader.c +++ b/src/simdag/sd_dotloader.c @@ -15,24 +15,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd,"Parsing DOT files"); #include static double parse_double(const char *string) { - if (string == NULL) return -10; - int ret = 0; - double value; - - ret = sscanf(string, "%lg", &value); - if (ret != 1) - WARN1("%s is not a double", string); - return value; + if (string == NULL) return -10; + int ret = 0; + double value; + + ret = sscanf(string, "%lg", &value); + if (ret != 1) + WARN1("%s is not a double", string); + 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; + 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 xbt_dynar_t result; @@ -42,17 +42,17 @@ 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); - } + unsigned int cursor; + SD_task_t task; + xbt_dynar_foreach(result,cursor,task) { + INFO1("Task %d",cursor); + SD_task_dump(task); + } } static void dot_task_free(void*task){ - SD_task_t t=task; - SD_task_destroy(t); + SD_task_t t=task; + SD_task_destroy(t); } void Start_dot_job(Agnode_t *dag_node) ; void input_edge(SD_task_t current_job, Agedge_t *edge) ; @@ -64,190 +64,189 @@ void output_edge(SD_task_t current_job, Agedge_t *edge) ; * for more details. */ 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; + 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_FILE(FILE* in_file){ - xbt_assert0(in_file, "Unable to use a null file descriptor\n"); - dag_dot = agread(in_file,NIL(Agdisc_t*)); - - 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_dynar_push(result,&root_task); - end_task = SD_task_create_comp_seq("end",NULL,0); - - Agnode_t *dag_node = NULL; - SD_task_t task_node = NULL; - for (dag_node = agfstnode(dag_dot); dag_node; dag_node = agnxtnode(dag_dot,dag_node)){ - Start_dot_job(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_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); - - //INFO2("result : %lld, dot : %lld",result,*dot); - return result; + xbt_assert0(in_file, "Unable to use a null file descriptor\n"); + dag_dot = agread(in_file,NIL(Agdisc_t*)); + + 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_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)){ + Start_dot_job(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_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); + + //INFO2("result : %lld, dot : %lld",result,*dot); + return result; } void Start_dot_job(Agnode_t *dag_node) { - char *name = agnameof(dag_node); - double runtime = parse_double(agget(dag_node,"size")); - int performer = parse_int(agget(dag_node,"performer")); - INFO3("See ",name,agget(dag_node,"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="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); - } - } - 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++; - } - if (count==0){ - SD_task_t file; - char *name = "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); - } - } + 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); + } + } + 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++; + } + 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); + } + } } 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,"size")); - int sender = parse_int(agget(edge,"sender")); - int reciever = parse_int(agget(edge,"reciever")); - - 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,file,current_job); + 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")); + + 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,file,current_job); } 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,"size")); - int sender = parse_int(agget(edge,"sender")); - int reciever = parse_int(agget(edge,"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); - } 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); - } + 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); + } 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); + } } diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c index 54efa7416d..5e3bf6fa0b 100644 --- a/src/simix/smx_network.c +++ b/src/simix/smx_network.c @@ -446,7 +446,7 @@ XBT_PUBLIC(void *) SIMIX_communication_get_dst_buf(smx_comm_t comm) } XBT_PUBLIC(size_t) SIMIX_communication_get_src_buf_size(smx_comm_t comm) { - return comm->src_buff_size; + return (void *)comm->src_buff_size; } XBT_PUBLIC(size_t *) SIMIX_communication_get_dst_buf_size(smx_comm_t comm) { @@ -496,7 +496,7 @@ XBT_INLINE void SIMIX_network_send(smx_rdv_t rdv, double task_size, double rate, XBT_INLINE void SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *dst_buff, size_t *dst_buff_size, smx_comm_t *comm_ref) { - *comm_ref = SIMIX_network_irecv(rdv,dst_buff,dst_buff_size); + *comm_ref = (smx_comm_t) SIMIX_network_irecv(rdv,dst_buff,dst_buff_size); SIMIX_network_wait(*comm_ref,timeout); }