X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4f2d08b0ae4625d32890dc4613e1d842ad0f7b77..9853c047276b618315bd3f064c1f13c3d3ccd771:/examples/s4u/exec-ptask/s4u-exec-ptask.cpp diff --git a/examples/s4u/exec-ptask/s4u-exec-ptask.cpp b/examples/s4u/exec-ptask/s4u-exec-ptask.cpp index 14907717b4..146753eb11 100644 --- a/examples/s4u/exec-ptask/s4u-exec-ptask.cpp +++ b/examples/s4u/exec-ptask/s4u-exec-ptask.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2017-2019. 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. */ @@ -18,16 +18,15 @@ * Please note that you must have the LV07 platform model enabled to use such constructs. */ -#include "simgrid/plugins/energy.h" #include -XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_energyptask, "Messages specific for this s4u example"); +XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_ptask, "Messages specific for this s4u example"); static void runner() { /* Retrieve the list of all hosts as an array of hosts */ - std::vector hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts(); - int hosts_count = hosts.size(); + auto hosts = simgrid::s4u::Engine::get_instance()->get_all_hosts(); + size_t hosts_count = hosts.size(); XBT_INFO("First, build a classical parallel task, with 1 Gflop to execute on each node, " "and 10MB to exchange between each pair"); @@ -36,60 +35,42 @@ static void runner() std::vector communication_amounts; /* ------[ test 1 ]----------------- */ - computation_amounts.assign(hosts.size(), 1e9 /*1Gflop*/); - communication_amounts.assign(hosts.size() * hosts.size(), 0); - for (int i = 0; i < hosts_count; i++) - for (int j = i + 1; j < hosts_count; j++) + computation_amounts.assign(hosts_count, 1e9 /*1Gflop*/); + communication_amounts.assign(hosts_count * hosts_count, 0); + for (size_t i = 0; i < hosts_count; i++) + for (size_t j = i + 1; j < hosts_count; j++) communication_amounts[i * hosts_count + j] = 1e7; // 10 MB simgrid::s4u::this_actor::parallel_execute(hosts, computation_amounts, communication_amounts); /* ------[ test 2 ]----------------- */ - XBT_INFO("We can do the same with a timeout of one second enabled."); - computation_amounts.assign(hosts.size(), 1e9 /*1Gflop*/); - communication_amounts.assign(hosts.size() * hosts.size(), 0); - for (int i = 0; i < hosts_count; i++) - for (int j = i + 1; j < hosts_count; j++) + XBT_INFO("We can do the same with a timeout of 10 seconds enabled."); + computation_amounts.assign(hosts_count, 1e9 /*1Gflop*/); + communication_amounts.assign(hosts_count * hosts_count, 0); + for (size_t i = 0; i < hosts_count; i++) + for (size_t j = i + 1; j < hosts_count; j++) communication_amounts[i * hosts_count + j] = 1e7; // 10 MB try { simgrid::s4u::this_actor::parallel_execute(hosts, computation_amounts, communication_amounts, - 1.0 /* timeout (in seconds)*/); - XBT_WARN("Woops, this did not timeout as expected... Please report that bug."); - } catch (xbt_ex& e) { - /* Do nothing this exception on timeout was expected */ - XBT_DEBUG("Caught expected exception: %s", e.what()); + 10.0 /* timeout (in seconds)*/); + xbt_die("Woops, this did not timeout as expected... Please report that bug."); + } catch (const simgrid::TimeoutException&) { + XBT_INFO("Caught the expected timeout exception."); } /* ------[ test 3 ]----------------- */ - XBT_INFO("Then, build a parallel task involving only computations and no communication (1 Gflop per node)"); - computation_amounts.assign(hosts.size(), 1e9 /*1Gflop*/); - communication_amounts.clear(); /* no comm */ + XBT_INFO("Then, build a parallel task involving only computations (of different amounts) and no communication"); + computation_amounts = {3e8, 6e8, 1e9}; // 300Mflop, 6Mflop, 1Gflop + communication_amounts.clear(); // no comm simgrid::s4u::this_actor::parallel_execute(hosts, computation_amounts, communication_amounts); /* ------[ test 4 ]----------------- */ - XBT_INFO("Then, build a parallel task involving only heterogeneous computations and no communication"); - computation_amounts.resize(hosts.size()); - for (int i = 0; i < hosts_count; i++) - computation_amounts[i] = 5 * (i + 1) * 1e8; // 500Mflop, 1Gflop, 1.5Gflop - communication_amounts.clear(); /* no comm */ - simgrid::s4u::this_actor::parallel_execute(hosts, computation_amounts, communication_amounts); - - /* ------[ test 5 ]----------------- */ XBT_INFO("Then, build a parallel task with no computation nor communication (synchro only)"); computation_amounts.clear(); communication_amounts.clear(); simgrid::s4u::this_actor::parallel_execute(hosts, computation_amounts, communication_amounts); - /* ------[ test 6 ]----------------- */ - XBT_INFO("Finally, trick the ptask to do a 'remote execution', on host %s", hosts[1]->get_cname()); - std::vector remote; - remote.push_back(hosts[1]); - computation_amounts.assign(1, 1e9); - communication_amounts.clear(); - - simgrid::s4u::this_actor::parallel_execute(remote, computation_amounts, communication_amounts); - XBT_INFO("Goodbye now!"); } @@ -97,15 +78,9 @@ int main(int argc, char* argv[]) { simgrid::s4u::Engine e(&argc, argv); - xbt_assert(argc <= 3, "1Usage: %s [--energy]", argv[0]); - xbt_assert(argc >= 2, "2Usage: %s [--energy]", argv[0]); - - if (argc == 3 && argv[2][2] == 'e') - sg_host_energy_plugin_init(); + xbt_assert(argc == 2, "Usage: %s ", argv[0]); e.load_platform(argv[1]); - - /* Pick a process, no matter which, from the platform file */ simgrid::s4u::Actor::create("test", simgrid::s4u::Host::by_name("MyHost1"), runner); e.run();