clean stuff even when the scheduled is not good

[simgrid.git] / src / simdag / sd_dotloader.c

diff --git a/src/simdag/sd_dotloader.c b/src/simdag/sd_dotloader.c
index 7c44089..5faa6c4 100644 (file)
--- a/src/simdag/sd_dotloader.c
+++ b/src/simdag/sd_dotloader.c
@@ -89,6 +89,12 @@ static void dot_task_free(void *task)
   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){
@@ -155,6 +161,18 @@ xbt_dynar_t SD_dotload_with_sched(const char *filename){
   }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_dict_foreach(computers,dict_cursor,computer_name,computer){
+    xbt_dynar_free(&computer);
+  }
+  xbt_dict_free(&computers);
+  xbt_dynar_foreach(result,count,task){
+     SD_task_destroy(task);
+  }
   return NULL;
 }
 
@@ -165,7 +183,7 @@ xbt_dynar_t SD_dotload_generic(const char * filename)
   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);
@@ -237,17 +255,13 @@ xbt_dynar_t SD_dotload_generic(const char * filename)
   /* Free previous copy of the files */
   xbt_dict_free(&files);
   fclose(in_file);
-  if(acyclic_graph_detail(result))
-    return result;
-  else {
-    unsigned int cpt;
+  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_foreach(result, cpt, file)
-      SD_task_destroy(file);
-     xbt_dynar_free_container(&result);
+    xbt_dynar_free(&result);
+    /* (result == NULL) here */
   }
-  return NULL;
+  return result;
 }
 
 /* dot_add_task create a sd_task and all transfers required for this