X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b61fd75d5de007848291c118e37bfe6aa3aa3fa9..5fa8d6780a107eb5ae1ff8a233b0dd23cb065f8a:/examples/simdag/dax/dax_test.c diff --git a/examples/simdag/dax/dax_test.c b/examples/simdag/dax/dax_test.c index 04b2a7d468..f27ba96651 100644 --- a/examples/simdag/dax/dax_test.c +++ b/examples/simdag/dax/dax_test.c @@ -1,6 +1,7 @@ /* simple test trying to load a DAX file. */ -/* Copyright (c) 2009 Da SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009, 2010. 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. */ @@ -24,8 +25,9 @@ static int name_compare_hosts(const void *n1, const void *n2) return strcmp(name1, name2); } -int main(int argc, char **argv) { - xbt_dynar_t dax; +int main(int argc, char **argv) +{ + xbt_dynar_t dax, changed; unsigned int cursor; SD_task_t task; @@ -34,15 +36,20 @@ int main(int argc, char **argv) { /* Check our arguments */ if (argc < 3) { - INFO1("Usage: %s platform_file dax_file [trace_file]", argv[0]); - INFO1("example: %s ../sd_platform.xml Montage_50.xml Montage_50.mytrace", argv[0]); + XBT_INFO("Usage: %s platform_file dax_file [trace_file]", argv[0]); + XBT_INFO + ("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],'.'); + char *last = strrchr(argv[2], '.'); - tracefilename=bprintf("%.*s.trace",last==NULL?strlen(argv[2]):last-argv[2],argv[2]); + tracefilename = + bprintf("%.*s.trace", + (int) (last == NULL ? strlen(argv[2]) : last - argv[2]), + argv[2]); } else { tracefilename = xbt_strdup(argv[3]); } @@ -51,67 +58,82 @@ int main(int argc, char **argv) { SD_create_environment(argv[1]); /* load the DAX file */ - dax=SD_daxload(argv[2]); + dax = SD_daxload(argv[2]); + if (!dax){ + XBT_ERROR("A problem occurred during DAX parsing (cycle or syntax). Do not continue this test"); + free(tracefilename); + SD_exit(); + return -1; + } /* Display all the tasks */ - INFO0("------------------- Display all tasks of the loaded DAG ---------------------------"); - xbt_dynar_foreach(dax,cursor,task) { + XBT_INFO + ("------------------- Display all tasks of the loaded DAG ---------------------------"); + xbt_dynar_foreach(dax, cursor, task) { SD_task_dump(task); } - FILE *dotout = fopen("dax.dot","w"); - fprintf(dotout,"digraph A {\n"); - xbt_dynar_foreach(dax,cursor,task) { - SD_task_dotty(task,dotout); + FILE *dotout = fopen("dax.dot", "w"); + fprintf(dotout, "digraph A {\n"); + xbt_dynar_foreach(dax, cursor, task) { + SD_task_dotty(task, dotout); } - fprintf(dotout,"}\n"); + 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(); + XBT_INFO("------------------- 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(dax,cursor,task) { + xbt_dynar_foreach(dax, 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]); + 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]); + SD_task_schedulel(task, 1, ws_list[cursor % count]); } } - INFO0("------------------- Run the schedule ---------------------------"); - SD_task_t *changed = SD_simulate(-1); - free(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); + XBT_INFO + ("------------------- Run the schedule ---------------------------"); + changed = SD_simulate(-1); + xbt_dynar_free_container(&changed); + XBT_INFO + ("------------------- Produce the trace file---------------------------"); + XBT_INFO("Producing the trace of the run into %s", tracefilename); + FILE *out = fopen(tracefilename, "w"); + xbt_assert(out, "Cannot write to %s", tracefilename); free(tracefilename); - xbt_dynar_foreach(dax,cursor,task) { + xbt_dynar_foreach(dax, 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)); + 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_start_time(task), - SD_workstation_get_name(wsl[1]),SD_workstation_get_name(wsl[0]), - SD_task_get_amount(task), SD_task_get_name(task)); + 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))); + xbt_die("Task %s is of unknown kind %d", SD_task_get_name(task), + SD_task_get_kind(task)); } SD_task_destroy(task); }