-/* 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"
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;
if(task->kind == SD_TASK_COMM_E2E) continue;
//test if all tasks are marked
if(task->marked == 0){
- WARN1("the task %s is not marked",task->name);
+ XBT_WARN("the task %s is not marked",task->name);
all_marked = false;
break;
}
}
task = NULL;
if(!all_marked){
- VERB0("there is at least one cycle in your task graph");
+ XBT_VERB("there is at least one cycle in your task graph");
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;
if(task->kind == SD_TASK_COMM_E2E) continue;
//test if all tasks are marked
if(task->marked == 0){
- WARN1("the task %s is in a cycle",task->name);
+ XBT_WARN("the task %s is in a cycle",task->name);
all_marked = false;
}
}
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) {
- INFO1("Task %d", cursor);
- SD_task_dump(task);
- }
-}
-
static void dax_task_free(void *task)
{
SD_task_t t = task;
SD_task_t file;
char *name;
FILE *in_file = fopen(filename, "r");
- xbt_assert1(in_file, "Unable to open \"%s\"\n", filename);
+ xbt_assert(in_file, "Unable to open \"%s\"\n", filename);
input_buffer = dax__create_buffer(in_file, 10);
dax__switch_to_buffer(input_buffer);
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);
- xbt_assert2(!dax_lex(), "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();
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
if (depafter->src){
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
if (depbefore->src){
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_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
+ XBT_WARN
("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
if (depbefore->src){
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_push(result, &newfile);
}
}
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.", 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 = dax_parse_double(A_dax__adag_version);
+ _XBT_GNUC_UNUSED double version;
+ version = dax_parse_double(A_dax__adag_version);
- xbt_assert1((version == 2.1),
+ xbt_assert(version == 2.1,
"Expected version 2.1 in <adag> tag, got %f. Fix the parser or your file",
version);
}
double runtime = dax_parse_double(A_dax__job_runtime);
char *name = bprintf("%s@%s", A_dax__job_id, A_dax__job_name);
runtime *= 4200000000.; /* Assume that timings were done on a 4.2GFlops machine. I mean, why not? */
-// INFO3("See <job id=%s runtime=%s %.0f>",A_dax__job_id,A_dax__job_runtime,runtime);
+// XBT_INFO("See <job id=%s runtime=%s %.0f>",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);
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);
double size = dax_parse_double(A_dax__uses_size);
int is_input = (A_dax__uses_link == A_dax__uses_link_input);
-// INFO2("See <uses file=%s %s>",A_dax__uses_file,(is_input?"in":"out"));
+// XBT_INFO("See <uses file=%s %s>",A_dax__uses_file,(is_input?"in":"out"));
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) {
- WARN3("Ignoring file %s size redefinition from %.0f to %.0f",
+ XBT_WARN("Ignoring file %s size redefinition from %.0f to %.0f",
A_dax__uses_file, SD_task_get_amount(file), size);
}
}
} else {
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);
+ XBT_WARN("File %s created at more than one location...", file->name);
}
}
}
current_child->name, A_dax__parent_ref,
A_dax__parent_ref));
SD_task_dependency_add(NULL, NULL, parent, current_child);
- DEBUG2("Control-flow dependency from %s to %s", current_child->name,
+ XBT_DEBUG("Control-flow dependency from %s to %s", current_child->name,
parent->name);
}
void ETag_dax__adag(void)
{
-// INFO0("See </adag>");
+// XBT_INFO("See </adag>");
}
void ETag_dax__job(void)
{
current_job = NULL;
-// INFO0("See </job>");
+// XBT_INFO("See </job>");
}
void ETag_dax__parent(void)
{
-// INFO0("See </parent>");
+// XBT_INFO("See </parent>");
}
void ETag_dax__uses(void)
{
-// INFO0("See </uses>");
+// XBT_INFO("See </uses>");
}
