SD_task_dependency_add(): remove unused parameters 'name' and 'data'.

[simgrid.git] / examples / simdag / throttling / sd_throttling.c

diff --git a/examples/simdag/throttling/sd_throttling.c b/examples/simdag/throttling/sd_throttling.c
index 65f2401..ec120e1 100644 (file)
--- a/examples/simdag/throttling/sd_throttling.c
+++ b/examples/simdag/throttling/sd_throttling.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2010, 2012-2015. The SimGrid Team.
+/* Copyright (c) 2006-2010, 2012-2018. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -12,7 +12,7 @@ int main(int argc, char **argv)
 {
   unsigned int ctr;
   SD_task_t task;
-  xbt_dynar_t changed_tasks;
+  xbt_dynar_t changed_tasks = xbt_dynar_new(sizeof(SD_task_t), NULL);
 
   SD_init(&argc, argv);
   xbt_assert(argc > 1, "Usage: %s platform_file\n\nExample: %s two_clusters.xml", argv[0], argv[0]);
@@ -29,10 +29,10 @@ int main(int argc, char **argv)
   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);
-  SD_task_dependency_add(NULL, NULL, taskC, taskD);
-  SD_task_dependency_add(NULL, NULL, taskD, taskE);
+  SD_task_dependency_add(taskA, taskB);
+  SD_task_dependency_add(taskB, taskC);
+  SD_task_dependency_add(taskC, taskD);
+  SD_task_dependency_add(taskD, taskE);
 
   /* Add watchpoints on completion of compute tasks */
   SD_task_watch(taskA, SD_DONE);
@@ -44,12 +44,15 @@ int main(int argc, char **argv)
   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)))) {
+
+  SD_simulate_with_update(-1.0, changed_tasks);
+  while (!xbt_dynar_is_empty(changed_tasks)) {
     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_dynar_reset(changed_tasks);
 
     /* 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.
@@ -58,8 +61,11 @@ int main(int argc, char **argv)
      */
     if (SD_task_get_state(taskC) == SD_DONE && SD_task_get_state(taskD) < SD_RUNNING)
       SD_task_set_rate(taskD, 6.25);
+    SD_simulate_with_update(-1.0, changed_tasks);
   }
 
+  xbt_dynar_free(&changed_tasks);
+
   XBT_DEBUG("Destroying tasks...");
   SD_task_destroy(taskA);
   SD_task_destroy(taskB);
@@ -68,7 +74,6 @@ int main(int argc, char **argv)
   SD_task_destroy(taskE);
 
   XBT_DEBUG("Tasks destroyed. Exiting SimDag...");
-  SD_exit();
   xbt_free(hosts);
   return 0;
 }