Start the SimDag revolution: function renaming

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

diff --git a/examples/simdag/sd_test.c b/examples/simdag/sd_test.c
index 3d8acc7..ce59643 100644 (file)
--- a/examples/simdag/sd_test.c
+++ b/examples/simdag/sd_test.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2006-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"
 
@@ -76,12 +76,12 @@ int main(int argc, char **argv)
   for (i = 0; i < route_size; i++) {
     XBT_INFO("   Link %s: latency = %f, bandwidth = %f",
           SD_link_get_name(route[i]),
-          SD_link_get_current_latency(route[i]),
-          SD_link_get_current_bandwidth(route[i]));
+          SD_link_get_latency(route[i]),
+          SD_link_get_bandwidth(route[i]));
   }
   XBT_INFO("Route latency = %f, route bandwidth = %f",
-        SD_route_get_current_latency(w1, w2),
-        SD_route_get_current_bandwidth(w1, w2));
+        SD_route_get_latency(w1, w2),
+        SD_route_get_bandwidth(w1, w2));
   XBT_INFO("Communication time for %f bytes between %s and %s: %f",
         communication_amount12, name1, name2,
         SD_route_get_communication_time(w1, w2, communication_amount12));
@@ -95,6 +95,10 @@ int main(int argc, char **argv)
   taskC = SD_task_create("Task C", NULL, 30.0);
   taskD = SD_task_create("Task D", NULL, 60.0);
 
+  /* try to attach and retrieve user data to a task */
+  SD_task_set_data(taskA, (void*) &computation_amount1);
+  if (computation_amount1 != (*((double*) SD_task_get_data(taskA))))
+      XBT_ERROR("User data was corrupted by a simple set/get");
 
   SD_task_dependency_add(NULL, NULL, taskB, taskA);
   SD_task_dependency_add(NULL, NULL, taskC, taskA);
@@ -190,11 +194,9 @@ int main(int argc, char **argv)
   xbt_dynar_get_cpy(changed_tasks, 0, &checkD);
   xbt_dynar_get_cpy(changed_tasks, 1, &checkB);
 
-  xbt_assert0(checkD == taskD &&
+  xbt_assert(checkD == taskD &&
               checkB == taskB, "Unexpected simulation results");
 
-  xbt_dynar_free_container(&changed_tasks);
-
   XBT_DEBUG("Destroying tasks...");
 
   SD_task_destroy(taskA);