add the fonction SD_task_dotty in simdag after deleting by mistake and

correction on the fonction dotloader_FILE

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@7996 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/include/simdag/simdag.h b/include/simdag/simdag.h
index 2c73a3d..bfd28bc 100644 (file)
--- a/include/simdag/simdag.h
+++ b/include/simdag/simdag.h
@@ -146,6 +146,7 @@ XBT_PUBLIC(int) SD_task_get_workstation_count(SD_task_t task);
 XBT_PUBLIC(SD_workstation_t*) SD_task_get_workstation_list(SD_task_t task);
 XBT_PUBLIC(void) SD_task_destroy(SD_task_t task);
 XBT_PUBLIC(void) SD_task_dump(SD_task_t task);
+XBT_PUBLIC(void) SD_task_dotty(SD_task_t task,void* out_FILE);
 
 XBT_PUBLIC(SD_task_t) SD_task_create_comp_seq(const char*name,void *data,double amount);
 XBT_PUBLIC(SD_task_t) SD_task_create_comm_e2e(const char*name,void *data,double amount);
@@ -200,7 +201,6 @@ XBT_PUBLIC(double) SD_get_clock(void);
 XBT_PUBLIC(void) SD_exit(void);
 XBT_PUBLIC(xbt_dynar_t) SD_daxload(const char*filename);
 XBT_PUBLIC(xbt_dynar_t) SD_dotload(const char*filename);
-XBT_PUBLIC(xbt_dynar_t) SD_dotload_FILE(FILE* in_file);
 
 /** @} */
 

diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c
index d6bb08b..cb9108c 100644 (file)
--- a/src/simdag/sd_dotloader.c
+++ b/src/simdag/sd_dotloader.c
@@ -14,6 +14,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd,"Parsing DOT files");
 #undef CLEANUP
 #include <graphviz/cgraph.h>
 
+void dot_add_task(Agnode_t *dag_node) ;
+void dot_add_input_dependencies(SD_task_t current_job, Agedge_t *edge) ;
+void dot_add_output_dependencies(SD_task_t current_job, Agedge_t *edge) ;
+xbt_dynar_t SD_dotload_FILE(FILE* in_file);
+
 static double dot_parse_double(const char *string) {
     if (string == NULL) return -10;
     int ret = 0;
@@ -54,9 +59,6 @@ static void dot_task_free(void*task){
     SD_task_t t=task;
     SD_task_destroy(t);
 }
-void dot_add_task(Agnode_t *dag_node) ;
-void dot_add_input_dependencies(SD_task_t current_job, Agedge_t *edge) ;
-void dot_add_output_dependencies(SD_task_t current_job, Agedge_t *edge) ;
 
 /** @brief loads a DOT file describing a DAG
  *