X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/138e6f86566611611b1115c957cae0a1c6a85a4b..7ef49c428ab0209965a09a36ab28b59789aaa4b5:/examples/simdag/test/sd_test.cpp diff --git a/examples/simdag/test/sd_test.cpp b/examples/simdag/test/sd_test.cpp index 0815389294..5ba0bc0dd0 100644 --- a/examples/simdag/test/sd_test.cpp +++ b/examples/simdag/test/sd_test.cpp @@ -5,21 +5,20 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/simdag.h" +#include "simgrid/s4u.hpp" #include "xbt/ex.h" +#include #include "xbt/log.h" +#include +#include XBT_LOG_NEW_DEFAULT_CATEGORY(sd_test, "Logging specific to this SimDag example"); int main(int argc, char **argv) { - unsigned int ctr; - SD_task_t checkB, checkD; - xbt_dynar_t changed_tasks; - const int host_count = 2; sg_host_t host_list[2]; double computation_amount[2]; double communication_amount[4] = { 0 }; - double rate = -1.0; /* initialization of SD */ SD_init(&argc, argv); @@ -28,30 +27,30 @@ int main(int argc, char **argv) SD_create_environment(argv[1]); /* test the estimation functions */ - const sg_host_t *hosts = sg_host_list(); - sg_host_t h1 = hosts[0]; - sg_host_t h2 = hosts[1]; - const char *name1 = sg_host_get_name(h1); - const char *name2 = sg_host_get_name(h2); + const sg_host_t* hosts = sg_host_list(); + simgrid::s4u::Host* h1 = hosts[4]; + simgrid::s4u::Host* h2 = hosts[2]; double comp_amount1 = 2000000; double comp_amount2 = 1000000; double comm_amount12 = 2000000; double comm_amount21 = 3000000; - XBT_INFO("Computation time for %f flops on %s: %f", comp_amount1, name1, comp_amount1/sg_host_speed(h1)); - XBT_INFO("Computation time for %f flops on %s: %f", comp_amount2, name2, comp_amount2/sg_host_speed(h2)); - - XBT_INFO("Route between %s and %s:", name1, name2); - const SD_link_t *route = SD_route_get_list(h1, h2); - int route_size = SD_route_get_size(h1, h2); - for (int i = 0; i < route_size; i++) { - XBT_INFO(" Link %s: latency = %f, bandwidth = %f", sg_link_name(route[i]), sg_link_latency(route[i]), - sg_link_bandwidth(route[i])); - } - XBT_INFO("Route latency = %f, route bandwidth = %f", SD_route_get_latency(h1, h2), SD_route_get_bandwidth(h1, h2)); - XBT_INFO("Communication time for %f bytes between %s and %s: %f", comm_amount12, name1, name2, - SD_route_get_latency(h1, h2) + comm_amount12 / SD_route_get_bandwidth(h1, h2)); - XBT_INFO("Communication time for %f bytes between %s and %s: %f", comm_amount21, name2, name1, - SD_route_get_latency(h2, h1) + comm_amount21 / SD_route_get_bandwidth(h2, h1)); + XBT_INFO("Computation time for %f flops on %s: %f", comp_amount1, h1->getCname(), comp_amount1 / h1->getSpeed()); + XBT_INFO("Computation time for %f flops on %s: %f", comp_amount2, h2->getCname(), comp_amount2 / h2->getSpeed()); + + XBT_INFO("Route between %s and %s:", h1->getCname(), h2->getCname()); + std::vector route; + double latency = 0; + h1->routeTo(h2, &route, &latency); + + for (auto link : route) + XBT_INFO(" Link %s: latency = %f, bandwidth = %f", sg_link_name(link), sg_link_latency(link), + sg_link_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->getCname(), h2->getCname(), + sg_host_route_latency(h1, h2) + comm_amount12 / sg_host_route_bandwidth(h1, h2)); + XBT_INFO("Communication time for %f bytes between %s and %s: %f", comm_amount21, h2->getCname(), h1->getCname(), + 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); @@ -60,8 +59,8 @@ int main(int argc, char **argv) SD_task_t 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*) &comp_amount1); - if (comp_amount1 != (*((double*) SD_task_get_data(taskA)))) + SD_task_set_data(taskA, static_cast(&comp_amount1)); + if (fabs(comp_amount1 - (*(static_cast(SD_task_get_data(taskA))))) > 1e-12) XBT_ERROR("User data was corrupted by a simple set/get"); SD_task_dependency_add(NULL, NULL, taskB, taskA); @@ -73,8 +72,7 @@ int main(int argc, char **argv) try { SD_task_dependency_add(NULL, NULL, 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) { + } catch (xbt_ex& ex) { if (ex.category != arg_error) throw; /* this is a serious error */ } @@ -82,8 +80,7 @@ int main(int argc, char **argv) try { SD_task_dependency_add(NULL, NULL, 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) { + } catch (xbt_ex& ex) { if (ex.category != arg_error) throw; } @@ -91,8 +88,7 @@ int main(int argc, char **argv) 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) { + } catch (xbt_ex& ex) { if (ex.category != arg_error) throw; } @@ -100,8 +96,7 @@ int main(int argc, char **argv) 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) { + } catch (xbt_ex& ex) { if (ex.category != arg_error) throw; } @@ -124,25 +119,20 @@ int main(int argc, char **argv) /* 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, host_count, - host_list, computation_amount, communication_amount)); + 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)); - SD_task_schedule(taskA, host_count, host_list, computation_amount, communication_amount, rate); - SD_task_schedule(taskB, host_count, host_list, computation_amount, communication_amount, rate); - SD_task_schedule(taskC, host_count, host_list, computation_amount, communication_amount, rate); - SD_task_schedule(taskD, host_count, host_list, computation_amount, communication_amount, rate); + 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); - changed_tasks = SD_simulate(-1.0); - xbt_dynar_foreach(changed_tasks, ctr, task) { + std::set *changed_tasks = simgrid::sd::simulate(-1.0); + for (auto 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)); } - xbt_dynar_get_cpy(changed_tasks, 0, &checkD); - xbt_dynar_get_cpy(changed_tasks, 1, &checkB); - - xbt_assert(checkD == taskD && checkB == taskB, "Unexpected simulation results"); - XBT_DEBUG("Destroying tasks..."); SD_task_destroy(taskA); SD_task_destroy(taskB); @@ -150,6 +140,6 @@ int main(int argc, char **argv) SD_task_destroy(taskD); XBT_DEBUG("Tasks destroyed. Exiting SimDag..."); - SD_exit(); + xbt_free((sg_host_t*)hosts); return 0; }