SD_task_destroy(*t);
}
+#ifdef HAVE_TRACING
static void TRACE_sd_dotloader (SD_task_t task, const char *category)
{
- if (category){
- if (strlen (category) != 0){
- TRACE_category (category);
- SD_task_set_category (task, category);
- }
+ if (category && strlen (category)){
+ if (task->category)
+ XBT_DEBUG("Change the category of %s from %s to %s",
+ task->name, task->category, category);
+ else
+ XBT_DEBUG("Set the category of %s to %s",task->name, category);
+ TRACE_category (category);
+ TRACE_sd_set_task_category(task, category);
}
}
+#endif
/** @brief loads a DOT file describing a DAG
*
/* Free previous copy of the files */
xbt_dict_free(&files);
+ xbt_dict_free(&computers);
fclose(in_file);
if (!acyclic_graph_detail(result)) {
XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.",
dag_dot = agread(in_file, NIL(Agdisc_t *));
result = xbt_dynar_new(sizeof(SD_task_t), dot_task_p_free);
- files = xbt_dict_new_homogeneous(&dot_task_free);
+ files = xbt_dict_new_homogeneous(NULL);
jobs = xbt_dict_new_homogeneous(NULL);
computers = xbt_dict_new_homogeneous(NULL);
root_task = SD_task_create_comp_seq("root", NULL, 0);
SD_task_t file;
char *name;
xbt_dict_foreach(files, cursor, name, file) {
- unsigned int cpt1, cpt2;
- SD_task_t newfile = NULL;
- SD_dependency_t depbefore, depafter;
+ XBT_DEBUG("Considering file '%s' stored in the dictionnary",
+ file->name);
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);
- SD_task_dependency_add(NULL, NULL, root_task, newfile);
- SD_task_dependency_add(NULL, NULL, newfile, depafter->dst);
- xbt_dynar_push(result, &newfile);
- }
+ XBT_DEBUG("file '%s' has no source. Add dependency from 'root'",
+ file->name);
+ SD_task_dependency_add(NULL, NULL, root_task, file);
} 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);
- SD_task_dependency_add(NULL, NULL, depbefore->src, newfile);
- SD_task_dependency_add(NULL, NULL, newfile, end_task);
- 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) {
- 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);
- SD_task_dependency_add(NULL, NULL, depbefore->src, newfile);
- SD_task_dependency_add(NULL, NULL, newfile, depafter->dst);
- xbt_dynar_push(result, &newfile);
- }
- }
+ XBT_DEBUG("file '%s' has no destination. Add dependency to 'end'",
+ file->name);
+ SD_task_dependency_add(NULL, NULL, file, end_task);
}
+ xbt_dynar_push(result, &file);
}
/* Push end task last */
xbt_dynar_push(result, &end_task);
- /* Free previous copy of the files */
xbt_dict_free(&files);
fclose(in_file);
if (!acyclic_graph_detail(result)) {
XBT_DEBUG("See <job id=%s amount=%s %.0f alpha=%.2f>", name,
agget(dag_node, (char *) "size"), amount, alpha);
+ if (!strcmp(name, "root")){
+ XBT_WARN("'root' node is explicitly declared in the DOT file. Ignore it");
+ return;
+ }
+ if (!strcmp(name, "end")){
+ XBT_WARN("'end' node is explicitly declared in the DOT file. Ignore it");
+ return;
+ }
+
current_job = xbt_dict_get_or_null(jobs, name);
if (current_job == NULL) {
current_job =
XBT_DEBUG("See <job id=%s runtime=%s %.0f>", name,
agget(dag_node, (char *) "size"), runtime);
+
+ if (!strcmp(name, "root")){
+ XBT_WARN("'root' node is explicitly declared in the DOT file. Update it");
+ root_task->amount = runtime;
+#ifdef HAVE_TRACING
+ TRACE_sd_dotloader (root_task, agget (dag_node, (char*)"category"));
+#endif
+ }
+
+ if (!strcmp(name, "end")){
+ XBT_WARN("'end' node is explicitly declared in the DOT file. Update it");
+ end_task->amount = runtime;
+#ifdef HAVE_TRACING
+ TRACE_sd_dotloader (end_task, agget (dag_node, (char*)"category"));
+#endif
+ }
+
current_job = xbt_dict_get_or_null(jobs, name);
- if (current_job == NULL) {
+ if (!current_job) {
current_job =
SD_task_create_comp_seq(name, NULL , runtime);
#ifdef HAVE_TRACING
- TRACE_sd_dotloader (current_job, agget (dag_node, (char*)"category"));
+ TRACE_sd_dotloader (current_job, agget (dag_node, (char*)"category"));
#endif
xbt_dict_set(jobs, name, current_job, NULL);
xbt_dynar_push(result, ¤t_job);
char *name = xbt_malloc((strlen(name_head)+strlen(name_tail)+6)*sizeof(char));
sprintf(name, "%s->%s", name_tail, name_head);
double size = dot_parse_double(agget(edge, (char *) "size"));
- XBT_DEBUG("size : %e, get size : %s", size, agget(edge, (char *) "size"));
+ XBT_DEBUG("add input -- edge: %s, size : %e, get size : %s",
+ name, size, agget(edge, (char *) "size"));
if (size > 0) {
file = xbt_dict_get_or_null(files, name);
#ifdef HAVE_TRACING
TRACE_sd_dotloader (file, agget (edge, (char*)"category"));
#endif
+ XBT_DEBUG("add input -- adding %s to the dict as new file", name);
xbt_dict_set(files, name, file, NULL);
} else {
+ XBT_WARN("%s already exists", name);
if (SD_task_get_amount(file) != size) {
XBT_WARN("Ignoring file %s size redefinition from %.0f to %.0f",
name, SD_task_get_amount(file), size);
char *name = xbt_malloc((strlen(name_head)+strlen(name_tail)+6)*sizeof(char));
sprintf(name, "%s->%s", name_tail, name_head);
double size = dot_parse_double(agget(edge, (char *) "size"));
- XBT_DEBUG("size : %e, get size : %s", size, agget(edge, (char *) "size"));
+ XBT_DEBUG("add_output -- edge: %s, size : %e, get size : %s",
+ name, size, agget(edge, (char *) "size"));
if (size > 0) {
file = xbt_dict_get_or_null(files, name);
#ifdef HAVE_TRACING
TRACE_sd_dotloader (file, agget (edge, (char*)"category"));
#endif
+ XBT_DEBUG("add output -- adding %s to the dict as new file", name);
xbt_dict_set(files, name, file, NULL);
} else {
+ XBT_WARN("%s already exists", name);
if (SD_task_get_amount(file) != size) {
XBT_WARN("Ignoring file %s size redefinition from %.0f to %.0f",
name, SD_task_get_amount(file), size);
