X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6760cb07d6b57be16928d95339d71e57c4e24f36..05bd1b6f115cbd74bef46580923b26d9bdee9dfd:/testsuite/simdag/sd_test.c

diff --git a/testsuite/simdag/sd_test.c b/testsuite/simdag/sd_test.c
index 44d3680b35..5f3451ba7e 100644
--- a/testsuite/simdag/sd_test.c
+++ b/testsuite/simdag/sd_test.c
@@ -21,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;
@@ -30,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 */
@@ -52,26 +52,38 @@ 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);
   taskD = SD_task_create("Task D", NULL, 60.0);
 
-  INFO3("Computation time for %f flops on %s: %f", computation_amount1, name1,
-        SD_workstation_get_computation_time(w1, computation_amount1));
-  INFO3("Computation time for %f flops on %s: %f", computation_amount2, name2,
-        SD_workstation_get_computation_time(w2, computation_amount2));
+  INFO3("Computation time for %f flops on %s: %f", computation_amount1,
+        name1, SD_workstation_get_computation_time(w1,
+                                                   computation_amount1));
+  INFO3("Computation time for %f flops on %s: %f", computation_amount2,
+        name2, SD_workstation_get_computation_time(w2,
+                                                   computation_amount2));
 
   INFO2("Route between %s and %s:", name1, name2);
   for (i = 0; i < route_size; i++) {
     INFO3("\tLink %s: latency = %f, bandwidth = %f",
-          SD_link_get_name(route[i]), SD_link_get_current_latency(route[i]),
+          SD_link_get_name(route[i]),
+          SD_link_get_current_latency(route[i]),
           SD_link_get_current_bandwidth(route[i]));
   }
   INFO2("Route latency = %f, route bandwidth = %f",
@@ -94,7 +106,8 @@ int main(int argc, char **argv)
 
   TRY {
     SD_task_dependency_add(NULL, NULL, taskA, taskA);   /* shouldn't work and must raise an exception */
-    xbt_assert0(0, "Hey, I can add a dependency between Task A and Task A!");
+    xbt_assert0(0,
+                "Hey, I can add a dependency between Task A and Task A!");
   }
   CATCH(ex) {
   }
@@ -137,12 +150,12 @@ int main(int argc, char **argv)
     const int workstation_number = 2;
     const SD_workstation_t workstation_list[] = { w1, w2 };
     double computation_amount[] =
-      { computation_amount1, computation_amount2 };
+        { computation_amount1, computation_amount2 };
     double communication_amount[] = {
       0, communication_amount12,
       communication_amount21, 0
     };
-    SD_task_t *changed_tasks;
+    xbt_dynar_t changed_tasks;
     double rate = -1.0;
 
     /* estimated time */
@@ -164,12 +177,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...");