X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1bf13b42c09009ec33fd1928b8bffd2ded6bb931..49e2303ab8fb6ac8f8f7a0fbbaa73528256396a7:/src/smpi/internals/smpi_deployment.cpp diff --git a/src/smpi/internals/smpi_deployment.cpp b/src/smpi/internals/smpi_deployment.cpp index 7bbf7475a8..c23f5352b1 100644 --- a/src/smpi/internals/smpi_deployment.cpp +++ b/src/smpi/internals/smpi_deployment.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2019. The SimGrid Team. +/* Copyright (c) 2004-2020. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -20,11 +20,10 @@ static int universe_size = 0; class Instance { public: - Instance(const std::string& name, int max_no_processes, MPI_Comm comm) - : name_(name), size_(max_no_processes), comm_world_(comm) + Instance(int max_no_processes, MPI_Comm comm) : size_(max_no_processes), comm_world_(comm) { - MPI_Group group = new simgrid::smpi::Group(size_); - comm_world_ = new simgrid::smpi::Comm(group, nullptr, 0, -1); + auto* group = new simgrid::smpi::Group(size_); + comm_world_ = new simgrid::smpi::Comm(group, nullptr, false, -1); // FIXME : using MPI_Attr_put with MPI_UNIVERSE_SIZE is forbidden and we make it a no-op (which triggers a warning // as MPI_ERR_ARG is returned). Directly calling Comm::attr_put breaks for now, as MPI_UNIVERSE_SIZE,is <0 // instance.comm_world->attr_put(MPI_UNIVERSE_SIZE, reinterpret_cast(instance.size)); @@ -32,7 +31,6 @@ public: universe_size += max_no_processes; } - const std::string name_; unsigned int size_; unsigned int finalized_ranks_ = 0; MPI_Comm comm_world_; @@ -46,7 +44,7 @@ using simgrid::smpi::app::Instance; static std::map smpi_instances; /** @ingroup smpi_simulation - * @brief Registers a running instance of a MPI program. + * @brief Registers a running instance of an MPI program. * * @param name the reference name of the function. * @param code either the main mpi function @@ -60,7 +58,7 @@ void SMPI_app_instance_register(const char *name, xbt_main_func_t code, int num_ if (code != nullptr) // When started with smpirun, we will not execute a function simgrid::s4u::Engine::get_instance()->register_function(name, code); - Instance instance(std::string(name), num_processes, MPI_COMM_NULL); + Instance instance(num_processes, MPI_COMM_NULL); smpi_instances.insert(std::pair(name, instance)); }