X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a4b0a684c019c3c69ccace47ad12d34258785a44..f7e7ab4b96a63ab88ab00dc53e2b4eeb74910041:/src/simdag/sd_daxloader.c diff --git a/src/simdag/sd_daxloader.c b/src/simdag/sd_daxloader.c index 40b4e6298e..16af27ae30 100644 --- a/src/simdag/sd_daxloader.c +++ b/src/simdag/sd_daxloader.c @@ -1,13 +1,14 @@ -/* 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 * under the terms of the license (GNU LGPL) which comes with this package. */ #include "private.h" -#include "simdag/simdag.h" +#include "simgrid/simdag.h" #include "xbt/misc.h" #include "xbt/log.h" +#include "xbt/file.h" /* xbt_basename() */ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files"); @@ -22,7 +23,7 @@ bool parents_are_marked(SD_task_t task); static void dax_parse_error(char *msg) { fprintf(stderr, "Parse error on line %d: %s\n", dax_lineno, msg); - abort(); + xbt_abort(); } static double dax_parse_double(const char *string) @@ -36,17 +37,6 @@ static double dax_parse_double(const char *string) return value; } -static int dax_parse_int(const char *string) -{ - int ret = 0; - int value; - - ret = sscanf(string, "%d", &value); - if (ret != 1) - dax_parse_error(bprintf("%s is not an integer", string)); - return value; -} - /* Ensure that transfer tasks have unique names even though a file is used * several times */ @@ -253,16 +243,6 @@ static xbt_dict_t files; static SD_task_t current_job; static SD_task_t root_task, end_task; -static void dump_res() -{ - unsigned int cursor; - SD_task_t task; - xbt_dynar_foreach(result, cursor, task) { - XBT_INFO("Task %u", cursor); - SD_task_dump(task); - } -} - static void dax_task_free(void *task) { SD_task_t t = task; @@ -295,10 +275,9 @@ xbt_dynar_t SD_daxload(const char *filename) xbt_dynar_push(result, &root_task); end_task = SD_task_create_comp_seq("end", NULL, 0); - _XBT_GNUC_UNUSED int res; - res = dax_lex(); - xbt_assert(!res, "Parse error in %s: %s", filename, - dax__parse_err_msg()); + int res = dax_lex(); + if (res != 0) + xbt_die("Parse error in %s: %s", filename, dax__parse_err_msg()); dax__delete_buffer(input_buffer); fclose(in_file); dax_lex_destroy(); @@ -319,15 +298,13 @@ xbt_dynar_t SD_daxload(const char *filename) 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); -#ifdef HAVE_TRACING if (depafter->src){ const char *category = depafter->src->category; if (category){ TRACE_category (category); - SD_task_set_category (newfile, category); + TRACE_sd_set_task_category(newfile, category); } } -#endif xbt_dynar_push(result, &newfile); } } else if (xbt_dynar_is_empty(file->tasks_after)) { @@ -335,15 +312,13 @@ xbt_dynar_t SD_daxload(const char *filename) 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); -#ifdef HAVE_TRACING if (depbefore->src){ const char *category = depbefore->src->category; if (category){ TRACE_category (category); - SD_task_set_category (newfile, category); + TRACE_sd_set_task_category(newfile, category); } } -#endif xbt_dynar_push(result, &newfile); } } else { @@ -357,15 +332,13 @@ xbt_dynar_t SD_daxload(const char *filename) 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); -#ifdef HAVE_TRACING if (depbefore->src){ const char *category = depbefore->src->category; if (category){ TRACE_category (category); - SD_task_set_category (newfile, category); + TRACE_sd_set_task_category(newfile, category); } } -#endif xbt_dynar_push(result, &newfile); } } @@ -381,11 +354,29 @@ xbt_dynar_t SD_daxload(const char *filename) xbt_dynar_foreach(result, cpt, file) { if (SD_task_get_kind(file) == SD_TASK_COMM_E2E) { uniq_transfer_task_name(file); + } else if (SD_task_get_kind(file) == SD_TASK_COMP_SEQ){ + /* If some tasks do not take files as input, connect them to the root, if + * they don't produce files, connect them to the end node. + */ + if ((file != root_task) && xbt_dynar_is_empty(file->tasks_before)) { + SD_task_dependency_add(NULL, NULL, root_task, file); + } + if ((file != end_task) && xbt_dynar_is_empty(file->tasks_after)) { + SD_task_dependency_add(NULL, NULL, file, end_task); + } } } - acyclic_graph_detail(result); - return result; + if (!acyclic_graph_detail(result)){ + XBT_ERROR("The DAX described in %s is not a DAG. It contains a cycle.", + xbt_basename(filename)); + xbt_dynar_foreach(result, cpt, file) + SD_task_destroy(file); + xbt_dynar_free_container(&result); + return NULL; + } else { + return result; + } } void STag_dax__adag(void) @@ -405,13 +396,11 @@ void STag_dax__job(void) runtime *= 4200000000.; /* Assume that timings were done on a 4.2GFlops machine. I mean, why not? */ // XBT_INFO("See ",A_dax__job_id,A_dax__job_runtime,runtime); current_job = SD_task_create_comp_seq(name, NULL, runtime); -#ifdef HAVE_TRACING char *category = A_dax__job_name; if (category){ TRACE_category (category); - SD_task_set_category(current_job, category); + TRACE_sd_set_task_category(current_job, category); } -#endif xbt_dict_set(jobs, A_dax__job_id, current_job, NULL); free(name); xbt_dynar_push(result, ¤t_job);