X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b73466ada27682d1729f394549479da83ef4a99..9464eee80e78ebd7783dfa03dcf777a173a14025:/examples/simdag/sd_comm_throttling.c

diff --git a/examples/simdag/sd_comm_throttling.c b/examples/simdag/sd_comm_throttling.c
index 1364f6e73a..fef44bca18 100644
--- a/examples/simdag/sd_comm_throttling.c
+++ b/examples/simdag/sd_comm_throttling.c
@@ -1,51 +1,33 @@
-/* Copyright (c) 2006-2010, 2012-2013. The SimGrid Team.
+/* Copyright (c) 2006-2010, 2012-2015. 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_comm_throttling,
-                             "Logging specific to this SimDag example");
+XBT_LOG_NEW_DEFAULT_CATEGORY(sd_comm_throttling, "Logging specific to this SimDag example");
 
 int main(int argc, char **argv)
 {
   unsigned int ctr;
-  const char *platform_file;
-  const SD_workstation_t *workstations;
-  SD_task_t task, taskA, taskB, taskC, taskD, taskE;
+  SD_task_t task;
   xbt_dynar_t changed_tasks;
 
-  /* initialization of SD */
   SD_init(&argc, argv);
+  xbt_assert(argc > 1, "Usage: %s platform_file\n\nExample: %s two_clusters.xml", argv[0], argv[0]);
 
-  /*  xbt_log_control_set("sd.thres=debug"); */
+  SD_create_environment(argv[1]);
 
-  if (argc < 2) {
-    XBT_INFO("Usage: %s platform_file", argv[0]);
-    XBT_INFO("example: %s sd_platform.xml", argv[0]);
-    exit(1);
-  }
-
-  /* creation of the environment */
-  platform_file = argv[1];
-  SD_create_environment(platform_file);
- 
-  workstations = SD_workstation_get_list();
+  const sg_host_t *hosts = sg_host_list();
 
   /* creation of some typed tasks and their dependencies */
-  /* chain of five tasks, three compute tasks with two data transfers */
-  /* in between */
-  taskA = SD_task_create_comp_seq("Task A", NULL, 5e9);
-  taskB = SD_task_create_comm_e2e("Task B", NULL, 1e7);
-  taskC = SD_task_create_comp_seq("Task C", NULL, 5e9);
-  taskD = SD_task_create_comm_e2e("Task D", NULL, 1e7);
-  taskE = SD_task_create_comp_seq("Task E", NULL, 5e9);
+  /* chain of five tasks, three compute tasks with two data transfers in between */
+  SD_task_t taskA = SD_task_create_comp_seq("Task A", NULL, 5e9);
+  SD_task_t taskB = SD_task_create_comm_e2e("Task B", NULL, 1e7);
+  SD_task_t taskC = SD_task_create_comp_seq("Task C", NULL, 5e9);
+  SD_task_t taskD = SD_task_create_comm_e2e("Task D", NULL, 1e7);
+  SD_task_t taskE = SD_task_create_comp_seq("Task E", NULL, 5e9);
 
   SD_task_dependency_add(NULL, NULL, taskA, taskB);
   SD_task_dependency_add(NULL, NULL, taskB, taskC);
@@ -59,30 +41,26 @@ int main(int argc, char **argv)
 
   /* Auto-schedule the compute tasks on three different workstations */
   /* Data transfer tasks taskB and taskD are automagically scheduled */
-  SD_task_schedulel(taskA, 1, workstations[0]);
-  SD_task_schedulel(taskC, 1, workstations[1]);
-  SD_task_schedulel(taskE, 1, workstations[0]);
+  SD_task_schedulel(taskA, 1, hosts[0]);
+  SD_task_schedulel(taskC, 1, hosts[1]);
+  SD_task_schedulel(taskE, 1, hosts[0]);
   while (!xbt_dynar_is_empty((changed_tasks = SD_simulate(-1.0)))) {
     XBT_INFO("Simulation stopped after %.4f seconds", SD_get_clock());
     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));
     }
+
     /* let throttle the communication for taskD if its parent is SD_DONE */
-    /* the bandwidth is 1.25e8, the data size is 1e7, and we want to throttle
-     * the bandwidth by a factor 2. the rate is then 1.25e8/(2*1e7)=6.25
+    /* the bandwidth is 1.25e8, the data size is 1e7, and we want to throttle the bandwidth by a factor 2.
+     * The rate is then 1.25e8/(2*1e7)=6.25
+     * Changing the rate is possible before the task execution starts (in SD_RUNNING state).
      */
-    if (SD_task_get_state(taskC) == SD_DONE)
+    if (SD_task_get_state(taskC) == SD_DONE && SD_task_get_state(taskD) < SD_RUNNING)
       SD_task_set_rate(taskD, 6.25);
-    xbt_dynar_free_container(&changed_tasks);
   }
-  xbt_dynar_free_container(&changed_tasks);
 
   XBT_DEBUG("Destroying tasks...");
-
   SD_task_destroy(taskA);
   SD_task_destroy(taskB);
   SD_task_destroy(taskC);
@@ -90,7 +68,6 @@ int main(int argc, char **argv)
   SD_task_destroy(taskE);
 
   XBT_DEBUG("Tasks destroyed. Exiting SimDag...");
-
   SD_exit();
   return 0;
 }