some extra cleanups in simdag examples

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

diff --git a/examples/simdag/sd_avail.c b/examples/simdag/sd_avail.c
index bef36e9..f966a04 100644 (file)
--- a/examples/simdag/sd_avail.c
+++ b/examples/simdag/sd_avail.c
@@ -1,17 +1,12 @@
-/* Copyright (c) 2012. The SimGrid Team.
+/* Copyright (c) 2012-2016. 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"
-#include "xbt/ex.h"
-#include "xbt/log.h"
+#include "simgrid/simdag.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(sd_avail,
-                             "Logging specific to this SimDag example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(sd_avail, "Logging specific to this SimDag example");
 
 /* Test of dynamic availability traces
  * Scenario:
@@ -39,28 +34,26 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(sd_avail,
  *      c2: 62500000 bytes, should last 1.0001 seconds
  *      t3: 25000000 flops, should last 1 second
  *      c3: 31250000 bytes, should last 1.0001 seconds
- *      t4:
+ *      t4: 25000000 flops, should last 1 second
  */
 
 int main(int argc, char **argv)
 {
   unsigned int ctr;
-  const SD_workstation_t *workstations;
-  SD_task_t t1, c1, t2, c2, t3, c3, t4, task;
+  SD_task_t task;
   xbt_dynar_t changed_tasks;
 
   SD_init(&argc, argv);
   SD_create_environment(argv[1]);
-  workstations = SD_workstation_get_list();
+  const sg_host_t *hosts = sg_host_list();
 
-  t1 = SD_task_create_comp_seq("t1", NULL, 25000000);
-  c1 = SD_task_create_comm_e2e("c1", NULL, 125000000);
-  t2 = SD_task_create_comp_seq("t2", NULL, 25000000);
-  c2 = SD_task_create_comm_e2e("c2", NULL, 62500000);
-  t3 = SD_task_create_comp_seq("t3", NULL, 25000000);
-  c3 = SD_task_create_comm_e2e("c3", NULL, 31250000);
-  /* Should last 0.5 second */
-  t4 = SD_task_create_comp_seq("t4", NULL, 25000000);
+  SD_task_t t1 = SD_task_create_comp_seq("t1", NULL, 25000000);
+  SD_task_t c1 = SD_task_create_comm_e2e("c1", NULL, 125000000);
+  SD_task_t t2 = SD_task_create_comp_seq("t2", NULL, 25000000);
+  SD_task_t c2 = SD_task_create_comm_e2e("c2", NULL, 62500000);
+  SD_task_t t3 = SD_task_create_comp_seq("t3", NULL, 25000000);
+  SD_task_t c3 = SD_task_create_comm_e2e("c3", NULL, 31250000);
+  SD_task_t t4 = SD_task_create_comp_seq("t4", NULL, 25000000);
 
   /* Add dependencies: t1->c1->t2->c2->t3 */
   SD_task_dependency_add(NULL, NULL, t1, c1);
@@ -72,10 +65,10 @@ int main(int argc, char **argv)
 
   /* Schedule tasks t1 and w3 on first host, t2 on second host */
   /* Transfers are auto-scheduled */
-  SD_task_schedulel(t1, 1, workstations[0]);
-  SD_task_schedulel(t2, 1, workstations[1]);
-  SD_task_schedulel(t3, 1, workstations[0]);
-  SD_task_schedulel(t4, 1, workstations[1]);
+  SD_task_schedulel(t1, 1, hosts[0]);
+  SD_task_schedulel(t2, 1, hosts[1]);
+  SD_task_schedulel(t3, 1, hosts[0]);
+  SD_task_schedulel(t4, 1, hosts[1]);
 
   /* Add some watchpoint upon task completion */
   SD_task_watch(t1, SD_DONE);
@@ -86,19 +79,13 @@ int main(int argc, char **argv)
   SD_task_watch(c3, SD_DONE);
   SD_task_watch(t4, SD_DONE);
 
-  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]));
+  while (!xbt_dynar_is_empty((changed_tasks = SD_simulate(-1.0)))) {
+    XBT_INFO("link1: bw=%.0f, lat=%f", SD_route_get_bandwidth(hosts[0], hosts[1]),
+             SD_route_get_latency(hosts[0], hosts[1]));
+    XBT_INFO("Jupiter: speed=%.0f", sg_host_speed(hosts[0])* sg_host_get_available_speed(hosts[0]));
+    XBT_INFO("Tremblay: speed=%.0f", sg_host_speed(hosts[1])* sg_host_get_available_speed(hosts[1]));
     xbt_dynar_foreach(changed_tasks, ctr, task) {
-      XBT_INFO("Task '%s' start time: %f, finish time: %f",
-           SD_task_get_name(task),
+      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));
       if (SD_task_get_state(task)==SD_DONE)
         SD_task_destroy(task);