From 239a4433346f0075799df91488cf081f2a0d7b57 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Wed, 31 Jul 2019 18:12:10 +0200 Subject: [PATCH] smpi::ActorExt: this constructor parameter is not used --- src/smpi/include/smpi_actor.hpp | 4 ++-- src/smpi/internals/smpi_actor.cpp | 3 +-- src/smpi/internals/smpi_global.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/smpi/include/smpi_actor.hpp b/src/smpi/include/smpi_actor.hpp index 049cf67628..5d22d03d5d 100644 --- a/src/smpi/include/smpi_actor.hpp +++ b/src/smpi/include/smpi_actor.hpp @@ -27,7 +27,7 @@ class ActorExt { int sampling_ = 0; /* inside an SMPI_SAMPLE_ block? */ std::string instance_id_; bool replaying_ = false; /* is the process replaying a trace */ - s4u::Barrier* finalization_barrier_; + s4u::Barrier* finalization_barrier_ = nullptr; smpi_trace_call_location_t trace_call_loc_; s4u::ActorPtr actor_ = nullptr; smpi_privatization_region_t privatized_region_ = nullptr; @@ -45,7 +45,7 @@ class ActorExt { papi_counter_t papi_counter_data_; #endif public: - explicit ActorExt(s4u::ActorPtr actor, s4u::Barrier* barrier); + explicit ActorExt(s4u::ActorPtr actor); ActorExt(const ActorExt&) = delete; ActorExt& operator=(const ActorExt&) = delete; ~ActorExt(); diff --git a/src/smpi/internals/smpi_actor.cpp b/src/smpi/internals/smpi_actor.cpp index d4727a959f..41bca6b497 100644 --- a/src/smpi/internals/smpi_actor.cpp +++ b/src/smpi/internals/smpi_actor.cpp @@ -19,8 +19,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_process, smpi, "Logging specific to SMPI (k namespace simgrid { namespace smpi { -ActorExt::ActorExt(s4u::ActorPtr actor, s4u::Barrier* finalization_barrier) - : finalization_barrier_(finalization_barrier), actor_(actor) +ActorExt::ActorExt(s4u::ActorPtr actor) : actor_(actor) { mailbox_ = s4u::Mailbox::by_name("SMPI-" + std::to_string(actor_->get_pid())); mailbox_small_ = s4u::Mailbox::by_name("small-" + std::to_string(actor_->get_pid())); diff --git a/src/smpi/internals/smpi_global.cpp b/src/smpi/internals/smpi_global.cpp index 2019b2c33b..34327f6171 100644 --- a/src/smpi/internals/smpi_global.cpp +++ b/src/smpi/internals/smpi_global.cpp @@ -709,7 +709,7 @@ int smpi_main(const char* executable, int argc, char* argv[]) void SMPI_init(){ simgrid::s4u::Actor::on_creation.connect([](simgrid::s4u::Actor& actor) { if (not actor.is_daemon()) { - process_data.insert({&actor, new simgrid::smpi::ActorExt(&actor, nullptr)}); + process_data.insert({&actor, new simgrid::smpi::ActorExt(&actor)}); } }); simgrid::s4u::Actor::on_destruction.connect([](simgrid::s4u::Actor const& actor) { -- 2.20.1