change argument testing method (100% coverage)

[simgrid.git] / examples / simdag / sd_avail.c

diff --git a/examples/simdag/sd_avail.c b/examples/simdag/sd_avail.c
index 00d1aef..94c5809 100644 (file)
--- a/examples/simdag/sd_avail.c
+++ b/examples/simdag/sd_avail.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 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"
 
@@ -87,14 +87,14 @@ int main(int argc, char **argv)
 
   while (!xbt_dynar_is_empty((changed_tasks = SD_simulate(-1.0)))) {    
     XBT_INFO("link1: bw=%.0f, lat=%f",
-             SD_route_get_current_bandwidth(workstations[0], workstations[1]),
-             SD_route_get_current_latency(workstations[0], workstations[1]));
-    XBT_INFO("Jupiter: power=%.0f",
-             SD_workstation_get_power(workstations[0])*
-             SD_workstation_get_available_power(workstations[0]));
-    XBT_INFO("Tremblay: power=%.0f",
-             SD_workstation_get_power(workstations[1])*
-             SD_workstation_get_available_power(workstations[1]));
+             SD_route_get_bandwidth(workstations[0], workstations[1]),
+             SD_route_get_latency(workstations[0], workstations[1]));
+    XBT_INFO("Jupiter: speed=%.0f",
+             SD_workstation_get_speed(workstations[0])*
+             SD_workstation_get_available_speed(workstations[0]));
+    XBT_INFO("Tremblay: speed=%.0f",
+             SD_workstation_get_speed(workstations[1])*
+             SD_workstation_get_available_speed(workstations[1]));
     xbt_dynar_foreach(changed_tasks, ctr, task) {
       XBT_INFO("Task '%s' start time: %f, finish time: %f",
            SD_task_get_name(task),
@@ -102,9 +102,7 @@ int main(int argc, char **argv)
       if (SD_task_get_state(task)==SD_DONE)
         SD_task_destroy(task);
     }
-    xbt_dynar_free_container(&changed_tasks);
   }
-  xbt_dynar_free_container(&changed_tasks);
   SD_exit();
   return 0;
 }