More coding style updates for sg_link.

[simgrid.git] / examples / deprecated / simdag / test / sd_test.cpp

diff --git a/examples/deprecated/simdag/test/sd_test.cpp b/examples/deprecated/simdag/test/sd_test.cpp
index 22f5fbf..8fd8b55 100644 (file)
--- a/examples/deprecated/simdag/test/sd_test.cpp
+++ b/examples/deprecated/simdag/test/sd_test.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2006-2020. 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. */
@@ -40,8 +40,8 @@ int main(int argc, char **argv)
   h1->route_to(h2, route, &latency);
 
   for (auto const& link : route)
-    XBT_INFO("   Link %s: latency = %f, bandwidth = %f", sg_link_name(link), sg_link_latency(link),
-             sg_link_bandwidth(link));
+    XBT_INFO("   Link %s: latency = %f, bandwidth = %f", sg_link_get_name(link), sg_link_get_latency(link),
+             sg_link_get_bandwidth(link));
 
   XBT_INFO("Route latency = %f, route bandwidth = %f", latency, sg_host_route_bandwidth(h1, h2));
   XBT_INFO("Communication time for %f bytes between %s and %s: %f", comm_amount12, h1->get_cname(), h2->get_cname(),
@@ -50,10 +50,10 @@ int main(int argc, char **argv)
            sg_host_route_latency(h2, h1) + comm_amount21 / sg_host_route_bandwidth(h2, h1));
 
   /* creation of the tasks and their dependencies */
-  SD_task_t taskA = SD_task_create("Task A", NULL, 10.0);
-  SD_task_t taskB = SD_task_create("Task B", NULL, 40.0);
-  SD_task_t taskC = SD_task_create("Task C", NULL, 30.0);
-  SD_task_t taskD = SD_task_create("Task D", NULL, 60.0);
+  SD_task_t taskA = SD_task_create("Task A", nullptr, 10.0);
+  SD_task_t taskB = SD_task_create("Task B", nullptr, 40.0);
+  SD_task_t taskC = SD_task_create("Task C", nullptr, 30.0);
+  SD_task_t taskD = SD_task_create("Task D", nullptr, 60.0);
 
   /* try to attach and retrieve user data to a task */
   SD_task_set_data(taskA, static_cast<void*>(&comp_amount1));
@@ -69,33 +69,29 @@ int main(int argc, char **argv)
   try {
     SD_task_dependency_add(taskA, taskA); /* shouldn't work and must raise an exception */
     xbt_die("Hey, I can add a dependency between Task A and Task A!");
-  } catch (xbt_ex& ex) {
-    if (ex.category != arg_error)
-      throw;                  /* this is a serious error */
+  } catch (const std::invalid_argument& e) {
+    XBT_DEBUG("Caught invalid_argument: %s", e.what());
   }
 
   try {
     SD_task_dependency_add(taskB, taskA); /* shouldn't work and must raise an exception */
     xbt_die("Oh oh, I can add an already existing dependency!");
-  } catch (xbt_ex& ex) {
-    if (ex.category != arg_error)
-      throw;
+  } catch (const std::invalid_argument& e) {
+    XBT_DEBUG("Caught invalid_argument: %s", e.what());
   }
 
   try {
     SD_task_dependency_remove(taskA, taskC);    /* shouldn't work and must raise an exception */
     xbt_die("Dude, I can remove an unknown dependency!");
-  } catch (xbt_ex& ex) {
-    if (ex.category != arg_error)
-      throw;
+  } catch (const std::invalid_argument& e) {
+    XBT_DEBUG("Caught invalid_argument: %s", e.what());
   }
 
   try {
     SD_task_dependency_remove(taskC, taskC);    /* shouldn't work and must raise an exception */
     xbt_die("Wow, I can remove a dependency between Task C and itself!");
-  } catch (xbt_ex& ex) {
-    if (ex.category != arg_error)
-      throw;
+  } catch (const std::invalid_argument& e) {
+    XBT_DEBUG("Caught invalid_argument: %s", e.what());
   }
 
   /* if everything is ok, no exception is forwarded or rethrown by main() */
@@ -115,16 +111,15 @@ int main(int argc, char **argv)
   communication_amount[2] = comm_amount21;
 
   /* estimated time */
-  SD_task_t task = taskD;
-  XBT_INFO("Estimated time for '%s': %f", SD_task_get_name(task), SD_task_get_execution_time(task, 2, host_list,
-           computation_amount, communication_amount));
+  XBT_INFO("Estimated time for '%s': %f", SD_task_get_name(taskD),
+           SD_task_get_execution_time(taskD, 2, host_list, computation_amount, communication_amount));
 
   SD_task_schedule(taskA, 2, host_list, computation_amount, communication_amount, -1);
   SD_task_schedule(taskB, 2, host_list, computation_amount, communication_amount, -1);
   SD_task_schedule(taskC, 2, host_list, computation_amount, communication_amount, -1);
   SD_task_schedule(taskD, 2, host_list, computation_amount, communication_amount, -1);
 
-  std::set<SD_task_t> *changed_tasks = simgrid::sd::simulate(-1.0);
+  const std::set<SD_task_t>* changed_tasks = simgrid::sd::simulate(-1.0);
   for (auto const& task : *changed_tasks) {
     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));