X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eaa222acd330e2c3e2c517c5eaab82c8fcb8a4c1..20617cf3b759fbd35ddc68d0aee2965e8379c98b:/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 4f9b81ab07..c243494d00 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. 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. */ @@ -20,44 +20,40 @@ #include "simgrid/plugins/energy.h" #include -#include -#include XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_energyptask, "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::getInstance()->getAllHosts(); - 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"); - double* computation_amounts = new double[hosts_count](); - double* communication_amounts = new double[hosts_count * hosts_count](); - for (int i = 0; i < hosts_count; i++) - computation_amounts[i] = 1e9; // 1 Gflop + std::vector computation_amounts; + std::vector communication_amounts; - for (int i = 0; i < hosts_count; i++) - for (int j = i + 1; j < hosts_count; j++) + /* ------[ test 1 ]----------------- */ + computation_amounts.assign(hosts.size(), 1e9 /*1Gflop*/); + communication_amounts.assign(hosts.size() * hosts.size(), 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_count, hosts.data(), computation_amounts, communication_amounts); + 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 = new double[hosts_count](); - communication_amounts = new double[hosts_count * hosts_count](); - - for (int i = 0; i < hosts_count; i++) - computation_amounts[i] = 1e9; // 1 Gflop - - for (int i = 0; i < hosts_count; i++) - for (int j = i + 1; j < hosts_count; j++) + computation_amounts.assign(hosts.size(), 1e9 /*1Gflop*/); + communication_amounts.assign(hosts.size() * hosts.size(), 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_count, hosts.data(), computation_amounts, communication_amounts, + 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) { @@ -65,22 +61,34 @@ static void runner() XBT_DEBUG("Caught expected exception: %s", e.what()); } + /* ------[ test 3 ]----------------- */ XBT_INFO("Then, build a parallel task involving only computations and no communication (1 Gflop per node)"); - computation_amounts = new double[hosts_count](); - for (int i = 0; i < hosts_count; i++) - computation_amounts[i] = 1e9; // 1 Gflop - simgrid::s4u::this_actor::parallel_execute(hosts_count, hosts.data(), computation_amounts, nullptr /* no comm */); - + computation_amounts.assign(hosts.size(), 1e9 /*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 (size_t 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 = new double[hosts_count](); - communication_amounts = new double[hosts_count * hosts_count](); - simgrid::s4u::this_actor::parallel_execute(hosts_count, hosts.data(), computation_amounts, communication_amounts); + computation_amounts.clear(); + communication_amounts.clear(); + simgrid::s4u::this_actor::parallel_execute(hosts, computation_amounts, communication_amounts); - XBT_INFO("Finally, trick the ptask to do a 'remote execution', on host %s", hosts[1]->getCname()); - computation_amounts = new double[1]{1e9}; + /* ------[ 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::Host* remote[] = {hosts[1]}; - simgrid::s4u::this_actor::parallel_execute(1, remote, computation_amounts, nullptr); + simgrid::s4u::this_actor::parallel_execute(remote, computation_amounts, communication_amounts); XBT_INFO("Goodbye now!"); } @@ -95,10 +103,10 @@ int main(int argc, char* argv[]) if (argc == 3 && argv[2][2] == 'e') sg_host_energy_plugin_init(); - e.loadPlatform(argv[1]); + e.load_platform(argv[1]); /* Pick a process, no matter which, from the platform file */ - simgrid::s4u::Actor::createActor("test", simgrid::s4u::Host::by_name("MyHost1"), runner); + simgrid::s4u::Actor::create("test", simgrid::s4u::Host::by_name("MyHost1"), runner); e.run(); XBT_INFO("Simulation done.");