X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/examples/simdag/dax/dax_test.c diff --git a/examples/simdag/dax/dax_test.c b/examples/simdag/dax/dax_test.c index 86e54dc644..3d68e1b0be 100644 --- a/examples/simdag/dax/dax_test.c +++ b/examples/simdag/dax/dax_test.c @@ -1,6 +1,6 @@ /* simple test trying to load a DAX file. */ -/* Copyright (c) 2009, 2010. The SimGrid Team. +/* Copyright (c) 2009-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -8,7 +8,7 @@ #include #include -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/log.h" #include "xbt/ex.h" #include @@ -18,106 +18,116 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(test, 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))); - - return strcmp(name1, name2); + return strcmp( + sg_host_get_name(*(sg_host_t *) n1), + sg_host_get_name(*(sg_host_t *) n2) + ); } -int main(int argc, char **argv) { +int main(int argc, char **argv) +{ xbt_dynar_t dax; unsigned int cursor; SD_task_t task; - /* initialisation of SD */ + /* SD initialization */ SD_init(&argc, 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]); - 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 { + xbt_assert(argc > 2, "Usage: %s platform_file dax_file [jedule_file]\n" + "\tExample: %s simulacrum_7_hosts.xml Montage_25.xml Montage_25.jed", + argv[0], argv[0]); + + char *last = strrchr(argv[2], '.'); + char * tracefilename = bprintf("%.*s.trace",(int) (last == NULL ? + strlen(argv[2]) : + last - argv[2]), argv[2]); + if (argc == 4) tracefilename = xbt_strdup(argv[3]); - } - + /* creation of the environment */ 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(); + exit(255); + } /* 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(); - int totalHosts = SD_workstation_get_number(); - qsort((void *) ws_list, totalHosts, sizeof(SD_workstation_t), + XBT_INFO("------------------- Schedule tasks ---------------------------"); + const sg_host_t *ws_list = sg_host_list(); + int hosts_count = sg_host_count(); + qsort((void *) ws_list, hosts_count, sizeof(sg_host_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 % hosts_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 ---------------------------"); + SD_simulate(-1); + 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); + sg_host_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), + sg_host_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), + sg_host_get_name(wsl[0]), + sg_host_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), + sg_host_get_name(wsl[1]), + sg_host_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); } fclose(out); - + xbt_dynar_free_container(&dax); /* exit */ SD_exit(); return 0;