X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dff9e15c44ab6340d27215957c56fa72fad246a2..947af238c968c81491832227d9f6c3c56a7464ec:/testsuite/simdag/sd_test.c?ds=sidebyside

diff --git a/testsuite/simdag/sd_test.c b/testsuite/simdag/sd_test.c
index b9cb9026ee..3031f3183c 100644
--- a/testsuite/simdag/sd_test.c
+++ b/testsuite/simdag/sd_test.c
@@ -1,3 +1,9 @@
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. 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 <stdio.h>
 #include <stdlib.h>
 #include "simdag/simdag.h"
@@ -15,8 +21,8 @@ int main(int argc, char **argv)
   const SD_workstation_t *workstations;
   SD_workstation_t w1;
   SD_workstation_t w2;
-  const char *name1;
-  const char *name2;
+  const char *name1 = NULL;
+  const char *name2 = NULL;
   const double computation_amount1 = 2000000;
   const double computation_amount2 = 1000000;
   const double communication_amount12 = 2000000;
@@ -24,9 +30,9 @@ int main(int argc, char **argv)
   const SD_link_t *route;
   int route_size;
   SD_task_t taskA;
-  SD_task_t taskB;
-  SD_task_t taskC;
-  SD_task_t taskD;
+  SD_task_t taskB, checkB;
+  SD_task_t taskC, checkC;
+  SD_task_t taskD, checkD;
   xbt_ex_t ex;
 
   /* initialisation of SD */
@@ -46,12 +52,22 @@ int main(int argc, char **argv)
 
   /* test the estimation functions (use small_platform.xml) */
   workstations = SD_workstation_get_list();
+
+
+  for(i=0 ; i < SD_workstation_get_number() ; i++)
+  {
+	  INFO1("name : %s",SD_workstation_get_name(workstations[i]) );
+  }
+
   w1 = workstations[0];
   w2 = workstations[1];
   name1 = SD_workstation_get_name(w1);
   name2 = SD_workstation_get_name(w2);
+
   route = SD_route_get_list(w1, w2);
+
   route_size = SD_route_get_size(w1, w2);
+
   taskA = SD_task_create("Task A", NULL, 10.0);
   taskB = SD_task_create("Task B", NULL, 40.0);
   taskC = SD_task_create("Task C", NULL, 30.0);
@@ -136,7 +152,7 @@ int main(int argc, char **argv)
       0, communication_amount12,
       communication_amount21, 0
     };
-    SD_task_t *changed_tasks;
+    xbt_dynar_t changed_tasks;
     double rate = -1.0;
 
     /* estimated time */
@@ -144,7 +160,7 @@ int main(int argc, char **argv)
     INFO2("Estimated time for '%s': %f", SD_task_get_name(task),
           SD_task_get_execution_time(task, workstation_number,
                                      workstation_list, computation_amount,
-                                     communication_amount, rate));
+                                     communication_amount));
 
     /* let's launch the simulation! */
 
@@ -158,12 +174,16 @@ int main(int argc, char **argv)
                      computation_amount, communication_amount, rate);
 
     changed_tasks = SD_simulate(-1.0);
-    xbt_assert0(changed_tasks[0] == taskD &&
-                changed_tasks[1] == taskC &&
-                changed_tasks[2] == taskB &&
-                changed_tasks[3] == NULL, "Unexpected simulation results");
 
-    xbt_free(changed_tasks);
+    xbt_dynar_get_cpy(changed_tasks, 0, &checkD);
+    xbt_dynar_get_cpy(changed_tasks, 1, &checkC);
+    xbt_dynar_get_cpy(changed_tasks, 2, &checkB);
+ 
+    xbt_assert0(checkD == taskD &&
+                checkC == taskC &&
+                checkB == taskB, "Unexpected simulation results");
+
+    xbt_dynar_free_container(&changed_tasks);
   }
   DEBUG0("Destroying tasks...");