#include "simdag/simdag.h"
#include "xbt/misc.h"
#include "xbt/log.h"
+#include <libgen.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
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)
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 */
xbt_dynar_foreach(dag,count,task){
if(task->kind == SD_TASK_COMM_E2E) continue;
task->marked = 0;
- if(xbt_dynar_length(task->tasks_after) == 0){
+ if(xbt_dynar_is_empty(task->tasks_after)){
xbt_dynar_push(current, &task);
}
}
task = NULL;
count = 0;
//test if something has to be done for the next iteration
- while(xbt_dynar_length(current) != 0){
+ while(!xbt_dynar_is_empty(current)){
next = xbt_dynar_new(sizeof(SD_task_t),NULL);
//test if the current iteration is done
count_current=0;
current = xbt_dynar_new(sizeof(SD_task_t),NULL);
xbt_dynar_foreach(dag,count,task){
if(task->kind == SD_TASK_COMM_E2E) continue;
- if(xbt_dynar_length(task->tasks_before) == 0){
+ if(xbt_dynar_is_empty(task->tasks_before)){
xbt_dynar_push(current, &task);
}
}
task = NULL;
xbt_dynar_foreach(dag,count,task){
if(task->kind == SD_TASK_COMM_E2E) continue;
- if(xbt_dynar_length(task->tasks_before) == 0){
+ if(xbt_dynar_is_empty(task->tasks_before)){
task->marked = 1;
xbt_dynar_push(current, &task);
}
task = NULL;
count = 0;
//test if something has to be done for the next iteration
- while(xbt_dynar_length(current) != 0){
+ while(!xbt_dynar_is_empty(current)){
next = xbt_dynar_new(sizeof(SD_task_t),NULL);
//test if the current iteration is done
count_current=0;
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 %d", cursor);
- SD_task_dump(task);
- }
-}
-
static void dax_task_free(void *task)
{
SD_task_t t = task;
dax_lineno = 1;
result = xbt_dynar_new(sizeof(SD_task_t), dax_task_free);
- files = xbt_dict_new();
- jobs = xbt_dict_new();
+ files = xbt_dict_new_homogeneous(&dax_task_free);
+ jobs = 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_dynar_push(result, &root_task);
end_task = SD_task_create_comp_seq("end", NULL, 0);
- int res;
+ _XBT_GNUC_UNUSED int res;
res = dax_lex();
xbt_assert(!res, "Parse error in %s: %s", filename,
dax__parse_err_msg());
dax__delete_buffer(input_buffer);
fclose(in_file);
+ dax_lex_destroy();
xbt_dict_free(&jobs);
/* And now, post-process the files.
xbt_dict_foreach(files, cursor, name, file) {
unsigned int cpt1, cpt2;
- SD_task_t newfile = NULL;
+ SD_task_t newfile;
SD_dependency_t depbefore, depafter;
- if (xbt_dynar_length(file->tasks_before) == 0) {
+ 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);
+ 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
const char *category = depafter->src->category;
if (category){
TRACE_category (category);
- TRACE_sd_set_task_category (newfile, category);
+ TRACE_sd_set_task_category(newfile, category);
}
}
#endif
xbt_dynar_push(result, &newfile);
}
- } else if (xbt_dynar_length(file->tasks_after) == 0) {
+ } 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);
+ 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
const char *category = depbefore->src->category;
if (category){
TRACE_category (category);
- TRACE_sd_set_task_category (newfile, category);
+ TRACE_sd_set_task_category(newfile, category);
}
}
#endif
("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);
+ 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
const char *category = depbefore->src->category;
if (category){
TRACE_category (category);
- TRACE_sd_set_task_category (newfile, category);
+ TRACE_sd_set_task_category(newfile, category);
}
}
#endif
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.",
+ basename((char*)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)
{
- double version;
+ _XBT_GNUC_UNUSED double version;
version = dax_parse_double(A_dax__adag_version);
xbt_assert(version == 2.1,
file = xbt_dict_get_or_null(files, A_dax__uses_file);
if (file == NULL) {
file = SD_task_create_comm_e2e(A_dax__uses_file, NULL, size);
- xbt_dict_set(files, A_dax__uses_file, file, &dax_task_free);
+ xbt_dict_set(files, A_dax__uses_file, file, NULL);
} else {
if (SD_task_get_amount(file) != size) {
XBT_WARN("Ignoring file %s size redefinition from %.0f to %.0f",