X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54775a76fadd0bca35aace3d5456a251205162f0..acae87a17fa72c16ce794b55ace1459f24fe17b2:/examples/simdag/sd_typed_tasks_test.c

diff --git a/examples/simdag/sd_typed_tasks_test.c b/examples/simdag/sd_typed_tasks_test.c
index 9e9933a535..32f3e592ae 100644
--- a/examples/simdag/sd_typed_tasks_test.c
+++ b/examples/simdag/sd_typed_tasks_test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-2010, 2012-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "simdag/simdag.h"
+#include "simgrid/simdag.h"
 #include "xbt/ex.h"
 #include "xbt/log.h"
 
@@ -44,10 +44,6 @@ int main(int argc, char **argv)
  
   workstations = SD_workstation_get_list();
 
-  for (i=0;i<SD_workstation_get_number();i++)
-    XBT_INFO("%s runs at %f flops", SD_workstation_get_name(workstations[i]),
-       SD_workstation_get_power(workstations[i]));
-
   /* creation of some typed tasks and their dependencies */
   seq_comp1 = SD_task_create_comp_seq("Seq. comp. 1", NULL, 1e9);
   e2e_comm = SD_task_create_comm_e2e("E2E comm.", NULL, 1e7);
@@ -70,6 +66,16 @@ int main(int argc, char **argv)
   SD_task_schedulev(par_comp1, 4, workstations);
   SD_task_schedulev(par_comp2, 3, workstations);
 
+  /* Let's unschedule these tasks and test the auto-scheduling in the
+   * opposite way.
+   */
+  SD_task_unschedule(par_comp1);
+  SD_task_unschedule(par_comp2);
+  SD_task_unschedule(redist); /* yes, it was scheduled too */
+
+  SD_task_schedulev(par_comp2, 3, workstations);
+  SD_task_schedulev(par_comp1, 4, workstations);
+
   for (i=0;i<4;i++){
     workstation_list[i]=workstations[i+4];
     /* Apply Amdahl's law manually assuming a 20% serial part */
@@ -84,9 +90,11 @@ int main(int argc, char **argv)
     XBT_INFO("Task '%s' start time: %f, finish time: %f",
           SD_task_get_name(task),
           SD_task_get_start_time(task), SD_task_get_finish_time(task));
-    SD_task_destroy(task);
   }
 
+  xbt_dynar_foreach(changed_tasks, ctr, task) {
+    SD_task_destroy(task);
+  }
   SD_exit();
   return 0;
 }