never ending cleanup of the simdag world

[simgrid.git] / 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 632ca94..cd24809 100644 (file)
--- a/examples/simdag/sd_typed_tasks_test.c
+++ b/examples/simdag/sd_typed_tasks_test.c
@@ -1,45 +1,33 @@
-/* Copyright (c) 2006-2010, 2012-2015. The SimGrid Team.
+/* Copyright (c) 2006-2010, 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 "simgrid/simdag.h"
-#include "xbt/ex.h"
 #include "xbt/log.h"
 
-XBT_LOG_NEW_DEFAULT_CATEGORY(sd_typed_tasks_test,
-                             "Logging specific to this SimDag example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(sd_typed_tasks_test, "Logging specific to this SimDag example");
 
 int main(int argc, char **argv)
 {
   int i;
   unsigned int ctr;
-  const char *platform_file;
-  const sg_host_t *workstations;
+  const sg_host_t *hosts;
   SD_task_t task, seq_comp1, e2e_comm, seq_comp2;
   SD_task_t par_comp1, redist, par_comp2, par_comp3;
   xbt_dynar_t changed_tasks;
 
   double computation_amount[4];
   double communication_amount[16] = { 0 };
-  sg_host_t workstation_list[4];
-  
-  /* initialization of SD */
-  SD_init(&argc, argv);
+  sg_host_t host_list[4];
 
-  /*  xbt_log_control_set("sd.thres=debug"); */
+  SD_init(&argc, argv);
 
-  xbt_assert(argc > 1, "Usage: %s platform_file\n"
-       "\nExample: %s two_clusters.xml", argv[0], argv[0]);
+  xbt_assert(argc > 1, "Usage: %s platform_file\n\nExample: %s two_clusters.xml", argv[0], argv[0]);
+  SD_create_environment(argv[1]);
 
-  /* creation of the environment */
-  platform_file = argv[1];
-  SD_create_environment(platform_file);
- 
-  workstations = sg_host_list();
+  hosts = sg_host_list();
 
   /* creation of some typed tasks and their dependencies */
   seq_comp1 = SD_task_create_comp_seq("Seq. comp. 1", NULL, 1e9);
@@ -57,36 +45,32 @@ int main(int argc, char **argv)
   SD_task_dependency_add(NULL, NULL, par_comp1, redist);
   SD_task_dependency_add(NULL, NULL, redist, par_comp2);
 
-  SD_task_schedulel(seq_comp1, 1, workstations[8]);
-  SD_task_schedulel(seq_comp2, 1, workstations[9]);
+  SD_task_schedulel(seq_comp1, 1, hosts[8]);
+  SD_task_schedulel(seq_comp2, 1, hosts[9]);
 
-  SD_task_schedulev(par_comp1, 4, workstations);
-  SD_task_schedulev(par_comp2, 3, workstations);
+  SD_task_schedulev(par_comp1, 4, hosts);
+  SD_task_schedulev(par_comp2, 3, hosts);
 
-  /* Let's unschedule these tasks and test the auto-scheduling in the
-   * opposite way.
-   */
+  /* 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);
+  SD_task_schedulev(par_comp2, 3, hosts);
+  SD_task_schedulev(par_comp1, 4, hosts);
 
   for (i=0;i<4;i++){
-    workstation_list[i]=workstations[i+4];
+    host_list[i]=hosts[i+4];
     /* Apply Amdahl's law manually assuming a 20% serial part */
     computation_amount[i]=(0.2 + (1 - 0.2)/4) * SD_task_get_amount(par_comp3);
   }
 
-  SD_task_schedule(par_comp3, 4, workstation_list,
-                   computation_amount, communication_amount, -1);
+  SD_task_schedule(par_comp3, 4, host_list, computation_amount, communication_amount, -1);
 
   changed_tasks = SD_simulate(-1.0);
   xbt_dynar_foreach(changed_tasks, ctr, 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));
+    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));
   }
 
   xbt_dynar_foreach(changed_tasks, ctr, task) {