A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
revalidate tesh output for tracing ms and simdag
[simgrid.git]
/
src
/
simdag
/
sd_dotloader.c
diff --git
a/src/simdag/sd_dotloader.c
b/src/simdag/sd_dotloader.c
index
8d15084
..
9402eaa
100644
(file)
--- a/
src/simdag/sd_dotloader.c
+++ b/
src/simdag/sd_dotloader.c
@@
-9,6
+9,8
@@
#include "xbt/misc.h"
#include "xbt/log.h"
#include <stdbool.h>
#include "xbt/misc.h"
#include "xbt/log.h"
#include <stdbool.h>
+#include <string.h>
+#include <libgen.h>
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
@@
-18,6
+20,11
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
#include <graphviz/cgraph.h>
#elif HAVE_AGRAPH_H
#include <graphviz/agraph.h>
#include <graphviz/cgraph.h>
#elif HAVE_AGRAPH_H
#include <graphviz/agraph.h>
+#define agnxtnode(dot, node) agnxtnode(node)
+#define agfstin(dot, node) agfstin(node)
+#define agnxtin(dot, edge) agnxtin(edge)
+#define agfstout(dot, node) agfstout(node)
+#define agnxtout(dot, edge) agnxtout(edge)
#endif
void dot_add_task(Agnode_t * dag_node);
#endif
void dot_add_task(Agnode_t * dag_node);
@@
-27,20
+34,20
@@
xbt_dynar_t SD_dotload_generic(const char * filename);
static double dot_parse_double(const char *string)
{
static double dot_parse_double(const char *string)
{
-
if (string == NULL)
-
return -1;
-
double value = -1;
-
char *err;
-
-
//ret = sscanf(string, "%lg", &value);
-
errno = 0;
-
value = strtod(string,&err);
-
if(errno)
-
{
-
XBT_WARN("Failed to convert string to double: %s\n",strerror(errno));
-
return -1;
-
}
-
return value;
+ if (string == NULL)
+ return -1;
+ double value = -1;
+ char *err;
+
+ //ret = sscanf(string, "%lg", &value);
+ errno = 0;
+ value = strtod(string,&err);
+ if(errno)
+ {
+ XBT_WARN("Failed to convert string to double: %s\n",strerror(errno));
+ return -1;
+ }
+ return value;
}
}
@@
-82,6
+89,12
@@
static void dot_task_free(void *task)
SD_task_destroy(t);
}
SD_task_destroy(t);
}
+static void dot_task_p_free(void *task)
+{
+ SD_task_t *t = task;
+ SD_task_destroy(*t);
+}
+
static void TRACE_sd_dotloader (SD_task_t task, const char *category)
{
if (category){
static void TRACE_sd_dotloader (SD_task_t task, const char *category)
{
if (category){
@@
-154,11
+167,11
@@
xbt_dynar_t SD_dotload_with_sched(const char *filename){
xbt_dynar_t SD_dotload_generic(const char * filename)
{
xbt_assert(filename, "Unable to use a null file descriptor\n");
xbt_dynar_t SD_dotload_generic(const char * filename)
{
xbt_assert(filename, "Unable to use a null file descriptor\n");
-//dag_dot = agopen((char*)filename,Agstrictdirected,0);
+
//dag_dot = agopen((char*)filename,Agstrictdirected,0);
FILE *in_file = fopen(filename, "r");
dag_dot = agread(in_file, NIL(Agdisc_t *));
FILE *in_file = fopen(filename, "r");
dag_dot = agread(in_file, NIL(Agdisc_t *));
- result = xbt_dynar_new(sizeof(SD_task_t), dot_task_free);
+ result = xbt_dynar_new(sizeof(SD_task_t), dot_task_
p_
free);
files = xbt_dict_new_homogeneous(&dot_task_free);
jobs = xbt_dict_new_homogeneous(NULL);
computers = xbt_dict_new_homogeneous(NULL);
files = xbt_dict_new_homogeneous(&dot_task_free);
jobs = xbt_dict_new_homogeneous(NULL);
computers = xbt_dict_new_homogeneous(NULL);
@@
-172,15
+185,8
@@
xbt_dynar_t SD_dotload_generic(const char * filename)
xbt_dict_set(jobs, "end", end_task, NULL);
Agnode_t *dag_node = NULL;
xbt_dict_set(jobs, "end", end_task, NULL);
Agnode_t *dag_node = NULL;
- for (dag_node = agfstnode(dag_dot); dag_node;
-#ifdef HAVE_CGRAPH_H
- dag_node = agnxtnode(dag_dot, dag_node)
-#elif HAVE_AGRAPH_H
- dag_node = agnxtnode(dag_node)
-#endif
- ) {
-
- dot_add_task(dag_node);
+ 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);
}
agclose(dag_dot);
xbt_dict_free(&jobs);
@@
-237,11
+243,13
@@
xbt_dynar_t SD_dotload_generic(const char * filename)
/* Free previous copy of the files */
xbt_dict_free(&files);
fclose(in_file);
/* Free previous copy of the files */
xbt_dict_free(&files);
fclose(in_file);
- if(acyclic_graph_detail(result))
- return result;
- acyclic_graph_detail(result);
- free(dag_dot);
- return NULL;
+ if (!acyclic_graph_detail(result)) {
+ XBT_ERROR("The DOT described in %s is not a DAG. It contains a cycle.",
+ basename((char*)filename));
+ xbt_dynar_free(&result);
+ /* (result == NULL) here */
+ }
+ return result;
}
/* dot_add_task create a sd_task and all transfers required for this
}
/* dot_add_task create a sd_task and all transfers required for this
@@
-268,26
+276,15
@@
void dot_add_task(Agnode_t * dag_node)
Agedge_t *e;
int count = 0;
Agedge_t *e;
int count = 0;
-#ifdef HAVE_CGRAPH_H
- for (e = agfstin(dag_dot, dag_node); e; e = agnxtin(dag_dot, e))
-#elif HAVE_AGRAPH_H
- for (e = agfstin(dag_node); e; e = agnxtin(e))
-#endif
- {
- dot_add_input_dependencies(current_job, e);
- count++;
+ for (e = agfstin(dag_dot, dag_node); e; e = agnxtin(dag_dot, e)) {
+ dot_add_input_dependencies(current_job, e);
+ count++;
}
if (count == 0 && current_job != root_task) {
SD_task_dependency_add(NULL, NULL, root_task, current_job);
}
count = 0;
}
if (count == 0 && current_job != root_task) {
SD_task_dependency_add(NULL, NULL, root_task, current_job);
}
count = 0;
-#ifdef HAVE_CGRAPH_H
- for (e = agfstout(dag_dot, dag_node); e; e = agnxtout(dag_dot, e))
-#elif HAVE_AGRAPH_H
- for (e = agfstout(dag_node); e; e = agnxtout(e))
-#endif
- {
-
+ for (e = agfstout(dag_dot, dag_node); e; e = agnxtout(dag_dot, e)) {
dot_add_output_dependencies(current_job, e);
count++;
}
dot_add_output_dependencies(current_job, e);
count++;
}
@@
-342,7
+339,7
@@
void dot_add_task(Agnode_t * dag_node)
else {
//one of necessary parameters are not given
schedule = false;
else {
//one of necessary parameters are not given
schedule = false;
- XBT_VERB("The schedule is ignored, the task %s is not correctly schedule", current_job->name);
+ XBT_VERB("The schedule is ignored, the task %s is not correctly schedule
d
", current_job->name);
}
}
}
}
}
}
@@
-353,10
+350,10
@@
void dot_add_task(Agnode_t * dag_node)
* edge. */
void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge)
{
* edge. */
void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge)
{
- SD_task_t file;
+ SD_task_t file
= NULL
;
char *name_tail=agnameof(agtail(edge));
char *name_head=agnameof(aghead(edge));
char *name_tail=agnameof(agtail(edge));
char *name_head=agnameof(aghead(edge));
- char *name = malloc((strlen(name_head)+strlen(name_tail)+
3
)*sizeof(char));
+ char *name = 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"));
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"));
@@
-377,7
+374,7
@@
void dot_add_input_dependencies(SD_task_t current_job, Agedge_t * edge)
}
SD_task_dependency_add(NULL, NULL, file, current_job);
} else {
}
SD_task_dependency_add(NULL, NULL, file, current_job);
} else {
- file = xbt_dict_get_or_null(jobs,
agnameof(agtail(edge))
);
+ file = xbt_dict_get_or_null(jobs,
name_tail
);
if (file != NULL) {
SD_task_dependency_add(NULL, NULL, file, current_job);
}
if (file != NULL) {
SD_task_dependency_add(NULL, NULL, file, current_job);
}
@@
-394,7
+391,7
@@
void dot_add_output_dependencies(SD_task_t current_job, Agedge_t * edge)
SD_task_t file;
char *name_tail=agnameof(agtail(edge));
char *name_head=agnameof(aghead(edge));
SD_task_t file;
char *name_tail=agnameof(agtail(edge));
char *name_head=agnameof(aghead(edge));
- char *name = malloc((strlen(name_head)+strlen(name_tail)+
3
)*sizeof(char));
+ char *name = 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"));
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"));
@@
-418,7
+415,7
@@
void dot_add_output_dependencies(SD_task_t current_job, Agedge_t * edge)
XBT_WARN("File %s created at more than one location...", file->name);
}
} else {
XBT_WARN("File %s created at more than one location...", file->name);
}
} else {
- file = xbt_dict_get_or_null(jobs,
agnameof(aghead(edge))
);
+ file = xbt_dict_get_or_null(jobs,
name_head
);
if (file != NULL) {
SD_task_dependency_add(NULL, NULL, current_job, file);
}
if (file != NULL) {
SD_task_dependency_add(NULL, NULL, current_job, file);
}