-/* Copyright (c) 2009-2013. 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 <stdbool.h>
parallel
} seq_par_t;
-void dot_add_task(Agnode_t * dag_node);
-void dot_add_parallel_task(Agnode_t * dag_node);
-void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge,
- seq_par_t seq_or_par);
-void dot_add_output_dependencies(SD_task_t current_job, Agedge_t * edge,
- seq_par_t seq_or_par);
-xbt_dynar_t SD_dotload_generic(const char * filename);
-xbt_dynar_t SD_dotload_generic_alt(const char * filename, seq_par_t seq_or_par);
-
-static double dot_parse_double(const char *string) {
- if (string == NULL)
- return -1;
- double value = -1;
- char *err;
-
- errno = 0;
- value = strtod(string,&err);
- if(errno) {
- XBT_WARN("Failed to convert string to double: %s\n",strerror(errno));
- return -1;
- }
- return value;
-}
-
-
-static int dot_parse_int(const char *string) {
- if (string == NULL)
- return -10;
- int ret = 0;
- int value = -1;
-
- ret = sscanf(string, "%d", &value);
- if (ret != 1)
- XBT_WARN("%s is not an integer", string);
- return value;
-}
+xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par);
static xbt_dynar_t result;
static xbt_dict_t jobs;
-static xbt_dict_t files;
static xbt_dict_t computers;
-static SD_task_t root_task, end_task;
static Agraph_t *dag_dot;
static bool schedule = true;
-static void dot_task_free(void *task) {
- SD_task_t t = task;
- SD_task_destroy(t);
-}
-
static void dot_task_p_free(void *task) {
SD_task_t *t = task;
SD_task_destroy(*t);
}
-#ifdef HAVE_TRACING
static void TRACE_sd_dotloader (SD_task_t task, const char *category) {
if (category && strlen (category)){
if (task->category)
TRACE_sd_set_task_category(task, category);
}
}
-#endif
/** @brief loads a DOT file describing a DAG
*
*/
xbt_dynar_t SD_dotload(const char *filename) {
computers = xbt_dict_new_homogeneous(NULL);
-// SD_dotload_generic_alt(filename, sequential);
- SD_dotload_generic(filename);
+ schedule = false;
+ SD_dotload_generic(filename, sequential);
xbt_dynar_t computer = NULL;
xbt_dict_cursor_t dict_cursor;
char *computer_name;
xbt_dynar_t SD_dotload_with_sched(const char *filename) {
computers = xbt_dict_new_homogeneous(NULL);
-// SD_dotload_generic_alt(filename, sequential);
- SD_dotload_generic(filename);
+ SD_dotload_generic(filename, sequential);
if(schedule){
xbt_dynar_t computer = NULL;
}else{
XBT_WARN("The scheduling is ignored");
}
- SD_task_t task;
- unsigned int count;
xbt_dynar_t computer = NULL;
xbt_dict_cursor_t dict_cursor;
char *computer_name;
xbt_dynar_free(&computer);
}
xbt_dict_free(&computers);
- xbt_dynar_foreach(result,count,task){
- SD_task_destroy(task);
- }
+ xbt_dynar_free(&result);
return NULL;
}
xbt_dynar_t SD_PTG_dotload(const char * filename) {
- xbt_dynar_t result = SD_dotload_generic_alt(filename, parallel);
+ xbt_dynar_t result = SD_dotload_generic(filename, parallel);
if (!acyclic_graph_detail(result)) {
XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.",
basename((char*)filename));
return result;
}
-xbt_dynar_t SD_dotload_generic_alt(const char * filename, seq_par_t seq_or_par){
+#ifdef HAVE_CGRAPH_H
+static int edge_compare(const void *a, const void *b)
+{
+ unsigned va = AGSEQ(*(Agedge_t **)a);
+ unsigned vb = AGSEQ(*(Agedge_t **)b);
+ return va == vb ? 0 : (va < vb ? -1 : 1);
+}
+#endif
+
+xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par){
xbt_assert(filename, "Unable to use a null file descriptor\n");
unsigned int i;
result = xbt_dynar_new(sizeof(SD_task_t), dot_task_p_free);
jobs = xbt_dict_new_homogeneous(NULL);
FILE *in_file = fopen(filename, "r");
+ if (in_file == NULL)
+ xbt_die("Failed to open file: %s", filename);
dag_dot = agread(in_file, NIL(Agdisc_t *));
SD_task_t root, end, task;
/*
char *name = agnameof(node);
double amount = atof(agget(node, (char *) "size"));
- double alpha;
+ double alpha = 0.0;
if (seq_or_par == sequential){
XBT_DEBUG("See <job id=%s amount =%.0f>", name, amount);
} else {
- alpha = atof(agget(node, (char *) "alpha"));
- if (alpha == -1.)
+ if (!strcmp(agget(node, (char *) "alpha"), "")){
+ alpha = atof(agget(node, (char *) "alpha"));
+ if (alpha == -1.){
+ XBT_DEBUG("negative alpha value provided. Set to 0.");
+ alpha = 0.0 ;
+ }
+ } else {
+ XBT_DEBUG("no alpha value provided. Set to 0");
alpha = 0.0 ;
+ }
+
XBT_DEBUG("See <job id=%s amount =%.0f alpha = %.3f>",
name, amount, alpha);
}
} else {
task = SD_task_create_comp_par_amdahl(name, NULL , amount, alpha);
}
-#ifdef HAVE_TRACING
TRACE_sd_dotloader (task, agget (node, (char*)"category"));
-#endif
xbt_dict_set(jobs, name, task, NULL);
if (!strcmp(name, "root")){
/* by design the root task is always SCHEDULABLE */
}
}
- if(schedule && seq_or_par == sequential){
+ if((seq_or_par == sequential) &&
+ (schedule ||
+ XBT_LOG_ISENABLED(sd_dotparse, xbt_log_priority_verbose))){
/* try to take the information to schedule the task only if all is
* right*/
+ int performer, order;
+ char *char_performer = agget(node, (char *) "performer");
+ char *char_order = agget(node, (char *) "order");
/* performer is the computer which execute the task */
- int performer = -1;
- char * char_performer = agget(node, (char *) "performer");
- if (char_performer)
- performer = atoi(char_performer);
-
+ performer =
+ ((!char_performer || !strcmp(char_performer,"")) ? -1:atoi(char_performer));
/* order is giving the task order on one computer */
- int order = -1;
- char * char_order = agget(node, (char *) "order");
- if (char_order)
- order = atoi(char_order);
+ order = ((!char_order || !strcmp(char_order, ""))? -1:atoi(char_order));
+
XBT_DEBUG ("Task '%s' is scheduled on workstation '%d' in position '%d'",
task->name, performer, order);
xbt_dynar_t computer = NULL;
/*
* Create edges
*/
- node = NULL;
+ xbt_dynar_t edges = xbt_dynar_new(sizeof(Agedge_t*), NULL);
for (node = agfstnode(dag_dot); node; node = agnxtnode(dag_dot, node)) {
- Agedge_t * edge = NULL;
- for (edge = agfstout(dag_dot, node); edge; edge = agnxtout(dag_dot, edge)) {
+ unsigned cursor;
+ Agedge_t * edge;
+ xbt_dynar_reset(edges);
+ for (edge = agfstout(dag_dot, node); edge; edge = agnxtout(dag_dot, edge))
+ xbt_dynar_push_as(edges, Agedge_t *, edge);
+#ifdef HAVE_CGRAPH_H
+ /* Hack: circumvent a bug in libcgraph, where the edges are not always given
+ * back in creation order. We sort them again, according to their sequence
+ * id. The problem appears to be solved (i.e.: I did not test it) in
+ * graphviz' mercurial repository by the following changeset:
+ * changeset: 8431:d5f1fb7e8103
+ * user: Emden Gansner <erg@research.att.com>
+ * date: Tue Oct 11 12:38:58 2011 -0400
+ * summary: Make sure edges are stored in node creation order
+ * It should be fixed in graphviz 2.30 and above.
+ */
+ xbt_dynar_sort(edges, edge_compare);
+#endif
+ xbt_dynar_foreach(edges, cursor, edge) {
SD_task_t src, dst;
char *src_name=agnameof(agtail(edge));
char *dst_name=agnameof(aghead(edge));
task = SD_task_create_comm_e2e(name, NULL , size);
else
task = SD_task_create_comm_par_mxn_1d_block(name, NULL , size);
-#ifdef HAVE_TRACING
TRACE_sd_dotloader (task, agget (node, (char*)"category"));
-#endif
SD_task_dependency_add(NULL, NULL, src, task);
SD_task_dependency_add(NULL, NULL, task, dst);
xbt_dict_set(jobs, name, task, NULL);
} else {
XBT_WARN("Task '%s' is defined more than once", name);
}
+ xbt_free(name);
} else {
SD_task_dependency_add(NULL, NULL, src, dst);
}
}
}
+ xbt_dynar_free(&edges);
/* all compute and transfer tasks have been created, put the "end" node at
* the end of dynar
agclose(dag_dot);
xbt_dict_free(&jobs);
-
- return result;
-}
-
-xbt_dynar_t SD_dotload_generic(const char * filename) {
- xbt_assert(filename, "Unable to use a null file descriptor\n");
- FILE *in_file = fopen(filename, "r");
- 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(NULL);
- jobs = xbt_dict_new_homogeneous(NULL);
- computers = 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_dict_set(jobs, "root", root_task, NULL);
- xbt_dynar_push(result, &root_task);
- end_task = SD_task_create_comp_seq("end", NULL, 0);
- xbt_dict_set(jobs, "end", end_task, NULL);
-
- Agnode_t *dag_node = NULL;
- for (dag_node = agfstnode(dag_dot); dag_node; dag_node = agnxtnode(dag_dot, dag_node)) {
- dot_add_task(dag_node);
- }
- agclose(dag_dot);
- xbt_dict_free(&jobs);
- /* And now, post-process the files.
- * We want a file task per pair of computation tasks exchanging the file.
- * Duplicate on need
- * Files not produced in the system are said to be produced by root task
- * (top of DAG).
- * Files not consumed in the system are said to be consumed by end task
- * (bottom of DAG).
- */
- xbt_dict_cursor_t cursor;
- SD_task_t file;
- char *name;
- xbt_dict_foreach(files, cursor, name, file) {
- XBT_DEBUG("Considering file '%s' stored in the dictionary",
- file->name);
- if (xbt_dynar_is_empty(file->tasks_before)) {
- 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_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);
-
- xbt_dict_free(&files);
fclose(in_file);
+
if (!acyclic_graph_detail(result)) {
XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.",
basename((char*)filename));
}
return result;
}
-
-/* dot_add_task create a sd_task and all transfers required for this
- * task. The execution time of the task is given by the attribute size.
- * The unit of size is the Flop.*/
-void dot_add_task(Agnode_t * dag_node) {
- char *name = agnameof(dag_node);
- SD_task_t current_job;
- double runtime = dot_parse_double(agget(dag_node, (char *) "size"));
-
- 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;
- root_task->computation_amount[0]= 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;
- end_task->computation_amount[0]= 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) {
- current_job =
- SD_task_create_comp_seq(name, NULL , runtime);
-#ifdef HAVE_TRACING
- 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);
- }
- Agedge_t *e;
- int count = 0;
-
- for (e = agfstin(dag_dot, dag_node); e; e = agnxtin(dag_dot, e)) {
- dot_add_input_dependencies(current_job, e, sequential);
- count++;
- }
- if (count == 0 && current_job != root_task) {
- SD_task_dependency_add(NULL, NULL, root_task, current_job);
- }
- count = 0;
- for (e = agfstout(dag_dot, dag_node); e; e = agnxtout(dag_dot, e)) {
- dot_add_output_dependencies(current_job, e, sequential);
- count++;
- }
- if (count == 0 && current_job != end_task) {
- SD_task_dependency_add(NULL, NULL, current_job, end_task);
- }
-
- if(schedule || XBT_LOG_ISENABLED(sd_dotparse, xbt_log_priority_verbose)){
- /* try to take the information to schedule the task only if all is
- * right*/
- /* performer is the computer which execute the task */
- unsigned long performer = -1;
- char * char_performer = agget(dag_node, (char *) "performer");
- if (char_performer != NULL)
- performer = (long) dot_parse_int(char_performer);
-
- /* order is giving the task order on one computer */
- unsigned long order = -1;
- char * char_order = agget(dag_node, (char *) "order");
- if (char_order != NULL)
- order = (long) dot_parse_int(char_order);
- xbt_dynar_t computer = NULL;
- if(performer != -1 && order != -1){
- /* required parameters are given */
- computer = xbt_dict_get_or_null(computers, char_performer);
- if(computer == NULL){
- computer = xbt_dynar_new(sizeof(SD_task_t), NULL);
- xbt_dict_set(computers, char_performer, computer, NULL);
- }
- if(performer < xbt_lib_length(host_lib)){
- /* the wanted computer is available */
- SD_task_t *task_test = NULL;
- if(order < computer->used)
- task_test = xbt_dynar_get_ptr(computer,order);
- if(task_test != NULL && *task_test != NULL && *task_test != current_job){
- /* the user gives the same order to several tasks */
- schedule = false;
- XBT_VERB("The task %s starts on the computer %s at the position : %s like the task %s",
- (*task_test)->name, char_performer, char_order,
- current_job->name);
- }else{
- /* the parameter seems to be ok */
- xbt_dynar_set_as(computer, order, SD_task_t, current_job);
- }
- }else{
- /* the platform has not enough processors to schedule the DAG like
- * the user wants*/
- schedule = false;
- XBT_VERB("The schedule is ignored, there are not enough computers");
- }
- }
- else {
- /* one of required parameters is not given */
- schedule = false;
- XBT_VERB("The schedule is ignored, the task %s is not correctly scheduled",
- current_job->name);
- }
- }
-}
-
-/* dot_add_output_dependencies create the dependencies between a task
- * and a transfers. This is given by the edges in the dot file.
- * The amount of data transfers is given by the attribute size on the
- * edge. */
-void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge,
- seq_par_t seq_or_par) {
- SD_task_t file = NULL;
- char *name_tail=agnameof(agtail(edge));
- char *name_head=agnameof(aghead(edge));
- 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("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);
- if (file == NULL) {
- if (seq_or_par == sequential){
- file = SD_task_create_comm_e2e(name, NULL, size);
- } else {
- file = SD_task_create_comm_par_mxn_1d_block(name, NULL, size);
- }
-#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);
- }
- }
- SD_task_dependency_add(NULL, NULL, file, current_job);
- } else {
- file = xbt_dict_get_or_null(jobs, name_tail);
- if (file != NULL) {
- SD_task_dependency_add(NULL, NULL, file, current_job);
- }
- }
- free(name);
-}
-
-/* dot_add_output_dependencies create the dependencies between a
- * transfers and a task. This is given by the edges in the dot file.
- * The amount of data transfers is given by the attribute size on the
- * edge. */
-void dot_add_output_dependencies(SD_task_t current_job, Agedge_t * edge,
- seq_par_t seq_or_par) {
- SD_task_t file;
- char *name_tail=agnameof(agtail(edge));
- char *name_head=agnameof(aghead(edge));
- 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("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);
- if (file == NULL) {
- if (seq_or_par == sequential){
- file = SD_task_create_comm_e2e(name, NULL, size);
- } else {
- file = SD_task_create_comm_par_mxn_1d_block(name, NULL, size);
- }
-#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);
- }
- }
- SD_task_dependency_add(NULL, NULL, current_job, file);
- if (xbt_dynar_length(file->tasks_before) > 1) {
- XBT_WARN("File %s created at more than one location...", file->name);
- }
- } else {
- file = xbt_dict_get_or_null(jobs, name_head);
- if (file != NULL) {
- SD_task_dependency_add(NULL, NULL, current_job, file);
- }
- }
- free(name);
-}
