From 7ec4bfe63855f02819ad397d3b29babf4421ea00 Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Fri, 24 Dec 2021 12:16:48 +0100 Subject: [PATCH] [sonar] bunch of const --- examples/cpp/dag-comm/s4u-dag-comm.cpp | 6 +++--- examples/cpp/dag-failure/s4u-dag-failure.cpp | 2 +- examples/cpp/dag-from-dot/s4u-dag-from-dot.cpp | 4 ++-- examples/cpp/dag-io/s4u-dag-io.cpp | 4 ++-- examples/cpp/dag-simple/s4u-dag-simple.cpp | 6 +++--- include/simgrid/s4u/Comm.hpp | 4 ++-- include/simgrid/s4u/Engine.hpp | 2 +- include/simgrid/s4u/Exec.hpp | 2 +- src/instr/instr_platform.cpp | 4 ++-- src/kernel/EngineImpl.cpp | 2 +- src/kernel/actor/ActorImpl.cpp | 2 +- src/kernel/resource/VirtualMachineImpl.cpp | 2 +- src/plugins/host_dvfs.cpp | 2 +- src/plugins/host_load.cpp | 2 +- src/plugins/vm/dirty_page_tracking.cpp | 2 +- src/s4u/s4u_Engine.cpp | 2 +- src/s4u/s4u_Exec.cpp | 2 +- src/surf/HostImpl.cpp | 2 +- teshsuite/s4u/dependencies/dependencies.cpp | 4 ++-- 19 files changed, 28 insertions(+), 28 deletions(-) diff --git a/examples/cpp/dag-comm/s4u-dag-comm.cpp b/examples/cpp/dag-comm/s4u-dag-comm.cpp index b7a90ea13e..9401b8aa7b 100644 --- a/examples/cpp/dag-comm/s4u-dag-comm.cpp +++ b/examples/cpp/dag-comm/s4u-dag-comm.cpp @@ -19,17 +19,17 @@ int main(int argc, char* argv[]) auto jupiter = e.host_by_name("Jupiter"); // Display the details on vetoed activities - simgrid::s4u::Activity::on_veto.connect([](simgrid::s4u::Activity& a) { + simgrid::s4u::Activity::on_veto.connect([](const simgrid::s4u::Activity& a) { XBT_INFO("Activity '%s' vetoed. Dependencies: %s; Ressources: %s", a.get_cname(), (a.dependencies_solved() ? "solved" : "NOT solved"), (a.is_assigned() ? "assigned" : "NOT assigned")); }); simgrid::s4u::Activity::on_completion.connect([](simgrid::s4u::Activity& activity) { - auto* exec = dynamic_cast(&activity); + const auto* exec = dynamic_cast(&activity); if (exec != nullptr) XBT_INFO("Activity '%s' is complete (start time: %f, finish time: %f)", exec->get_cname(), exec->get_start_time(), exec->get_finish_time()); - auto* comm = dynamic_cast(&activity); + const auto* comm = dynamic_cast(&activity); if (comm != nullptr) XBT_INFO("Activity '%s' is complete", comm->get_cname()); }); diff --git a/examples/cpp/dag-failure/s4u-dag-failure.cpp b/examples/cpp/dag-failure/s4u-dag-failure.cpp index a3da8aa40c..2c6bd2e832 100644 --- a/examples/cpp/dag-failure/s4u-dag-failure.cpp +++ b/examples/cpp/dag-failure/s4u-dag-failure.cpp @@ -19,7 +19,7 @@ int main(int argc, char** argv) auto* faulty = e.host_by_name("Faulty Host"); auto* safe = e.host_by_name("Safe Host"); sg4::Activity::on_completion.connect([](sg4::Activity& activity) { - auto* exec = dynamic_cast(&activity); + const auto* exec = dynamic_cast(&activity); if (exec == nullptr) // Only Execs are concerned here return; if (exec->get_state() == sg4::Activity::State::FINISHED) diff --git a/examples/cpp/dag-from-dot/s4u-dag-from-dot.cpp b/examples/cpp/dag-from-dot/s4u-dag-from-dot.cpp index ce05e474b8..11b6eee49f 100644 --- a/examples/cpp/dag-from-dot/s4u-dag-from-dot.cpp +++ b/examples/cpp/dag-from-dot/s4u-dag-from-dot.cpp @@ -62,12 +62,12 @@ int main(int argc, char** argv) XBT_INFO("-------------- Summary of executed schedule ------------------"); for (const auto& a : dag) { - auto* exec = dynamic_cast(a.get()); + const auto* exec = dynamic_cast(a.get()); if (exec != nullptr) { XBT_INFO("[%f->%f] '%s' executed on %s", exec->get_start_time(), exec->get_finish_time(), exec->get_cname(), exec->get_host()->get_cname()); } - auto* comm = dynamic_cast(a.get()); + const auto* comm = dynamic_cast(a.get()); if (comm != nullptr) { XBT_INFO("[%f->%f] '%s' transferred from %s to %s", comm->get_start_time(), comm->get_finish_time(), comm->get_cname(), comm->get_source()->get_cname(), comm->get_destination()->get_cname()); diff --git a/examples/cpp/dag-io/s4u-dag-io.cpp b/examples/cpp/dag-io/s4u-dag-io.cpp index 12077c7331..9f1bee80f2 100644 --- a/examples/cpp/dag-io/s4u-dag-io.cpp +++ b/examples/cpp/dag-io/s4u-dag-io.cpp @@ -19,13 +19,13 @@ int main(int argc, char* argv[]) auto carl = e.host_by_name("carl"); // Display the details on vetoed activities - simgrid::s4u::Activity::on_veto.connect([](simgrid::s4u::Activity& a) { + simgrid::s4u::Activity::on_veto.connect([](const simgrid::s4u::Activity& a) { XBT_INFO("Activity '%s' vetoed. Dependencies: %s; Ressources: %s", a.get_cname(), (a.dependencies_solved() ? "solved" : "NOT solved"), (a.is_assigned() ? "assigned" : "NOT assigned")); }); simgrid::s4u::Activity::on_completion.connect([](simgrid::s4u::Activity& activity) { - auto* exec = dynamic_cast(&activity); + const auto* exec = dynamic_cast(&activity); if (exec == nullptr) // Only Execs are concerned here return; XBT_INFO("Activity '%s' is complete (start time: %f, finish time: %f)", exec->get_cname(), exec->get_start_time(), diff --git a/examples/cpp/dag-simple/s4u-dag-simple.cpp b/examples/cpp/dag-simple/s4u-dag-simple.cpp index f3fa340dbf..f377550aa0 100644 --- a/examples/cpp/dag-simple/s4u-dag-simple.cpp +++ b/examples/cpp/dag-simple/s4u-dag-simple.cpp @@ -18,8 +18,8 @@ int main(int argc, char* argv[]) auto fafard = e.host_by_name("Fafard"); // Display the details on vetoed activities - simgrid::s4u::Activity::on_veto.connect([](simgrid::s4u::Activity& a) { - auto& exec = static_cast(a); // all activities are execs in this example + simgrid::s4u::Activity::on_veto.connect([](const simgrid::s4u::Activity& a) { + const auto& exec = static_cast(a); // all activities are execs in this example XBT_INFO("Activity '%s' vetoed. Dependencies: %s; Ressources: %s", exec.get_cname(), (exec.dependencies_solved() ? "solved" : "NOT solved"), @@ -27,7 +27,7 @@ int main(int argc, char* argv[]) }); simgrid::s4u::Activity::on_completion.connect([](simgrid::s4u::Activity& activity) { - auto* exec = dynamic_cast(&activity); + const auto* exec = dynamic_cast(&activity); if (exec == nullptr) // Only Execs are concerned here return; XBT_INFO("Activity '%s' is complete (start time: %f, finish time: %f)", exec->get_cname(), exec->get_start_time(), diff --git a/include/simgrid/s4u/Comm.hpp b/include/simgrid/s4u/Comm.hpp index 6806ed9530..bee49b304a 100644 --- a/include/simgrid/s4u/Comm.hpp +++ b/include/simgrid/s4u/Comm.hpp @@ -108,9 +108,9 @@ public: /** Set the source and destination of communications that bypass the mailbox mechanism */ CommPtr set_source(Host* from); - Host* get_source() { return from_; } + Host* get_source() const { return from_; } CommPtr set_destination(Host* to); - Host* get_destination() { return to_; } + Host* get_destination() const { return to_; } /** Sets the maximal communication rate (in byte/sec). Must be done before start */ CommPtr set_rate(double rate); diff --git a/include/simgrid/s4u/Engine.hpp b/include/simgrid/s4u/Engine.hpp index 20f6ee873b..e57c3b6264 100644 --- a/include/simgrid/s4u/Engine.hpp +++ b/include/simgrid/s4u/Engine.hpp @@ -85,7 +85,7 @@ public: } /** If non-null, the provided set will be filled with all activities that fail to start because of a veto */ - void track_vetoed_activities(std::set* vetoed_activities); + void track_vetoed_activities(std::set* vetoed_activities) const; void load_deployment(const std::string& deploy) const; diff --git a/include/simgrid/s4u/Exec.hpp b/include/simgrid/s4u/Exec.hpp index e030b5a9a1..14c173b6bf 100644 --- a/include/simgrid/s4u/Exec.hpp +++ b/include/simgrid/s4u/Exec.hpp @@ -40,7 +40,7 @@ class XBT_PUBLIC Exec : public Activity_T { protected: explicit Exec(kernel::activity::ExecImplPtr pimpl); - void reset(); + void reset() const; public: #ifndef DOXYGEN diff --git a/src/instr/instr_platform.cpp b/src/instr/instr_platform.cpp index 801cd44528..67cf07540d 100644 --- a/src/instr/instr_platform.cpp +++ b/src/instr/instr_platform.cpp @@ -467,7 +467,7 @@ void define_callbacks() s4u::Exec::on_start.connect([](s4u::Exec const&) { Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->push_event("execute"); }); - s4u::Activity::on_completion.connect([](s4u::Activity&) { + s4u::Activity::on_completion.connect([](const s4u::Activity&) { Container::by_name(instr_pid(*s4u::Actor::self()))->get_state("ACTOR_STATE")->pop_event(); }); s4u::Comm::on_send.connect([](s4u::Comm const&) { @@ -485,7 +485,7 @@ void define_callbacks() ->get_state("MPI_STATE") ->push_event("computing", new CpuTIData("compute", exec.get_cost())); }); - s4u::Activity::on_completion.connect([](s4u::Activity&) { + s4u::Activity::on_completion.connect([](const s4u::Activity&) { Container::by_name(std::string("rank-") + std::to_string(s4u::Actor::self()->get_pid())) ->get_state("MPI_STATE") ->pop_event(); diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 9017884f6c..665e7cbf97 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -696,7 +696,7 @@ void EngineImpl::run(double max_date) } double elapsed_time = -1; - std::set* vetoed_activities = s4u::Activity::get_vetoed_activities(); + const std::set* vetoed_activities = s4u::Activity::get_vetoed_activities(); do { XBT_DEBUG("New Schedule Round; size(queue)=%zu", actors_to_run_.size()); diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index e670469091..6e206ebe55 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -536,6 +536,6 @@ smx_actor_t SIMIX_process_from_PID(aid_t pid) // XBT_ATTRIB_DEPRECATED_v331 int SIMIX_is_maestro() // XBT_ATTRIB_DEPRECATED_v333 { - auto* self = simgrid::kernel::actor::ActorImpl::self(); + const auto* self = simgrid::kernel::actor::ActorImpl::self(); return self != nullptr && self->is_maestro(); } diff --git a/src/kernel/resource/VirtualMachineImpl.cpp b/src/kernel/resource/VirtualMachineImpl.cpp index de7fddbd8f..e429c16f96 100644 --- a/src/kernel/resource/VirtualMachineImpl.cpp +++ b/src/kernel/resource/VirtualMachineImpl.cpp @@ -77,7 +77,7 @@ static void add_active_exec(s4u::Exec const& task) static void remove_active_exec(s4u::Activity& task) { - auto* exec = dynamic_cast(&task); + const auto* exec = dynamic_cast(&task); if (exec == nullptr) return; const s4u::VirtualMachine* vm = dynamic_cast(exec->get_host()); diff --git a/src/plugins/host_dvfs.cpp b/src/plugins/host_dvfs.cpp index bc6203bbff..ef6f7d4788 100644 --- a/src/plugins/host_dvfs.cpp +++ b/src/plugins/host_dvfs.cpp @@ -300,7 +300,7 @@ public: pre_task(); }); simgrid::s4u::Activity::on_completion.connect([this](simgrid::s4u::Activity& activity) { - auto* exec = dynamic_cast(&activity); + const auto* exec = dynamic_cast(&activity); if (exec == nullptr) // Only Execs are concerned here return; // For more than one host (not yet supported), we can access the host via diff --git a/src/plugins/host_load.cpp b/src/plugins/host_load.cpp index 545befbc6c..3f95fb40c9 100644 --- a/src/plugins/host_load.cpp +++ b/src/plugins/host_load.cpp @@ -250,7 +250,7 @@ void sg_host_load_plugin_init() } }); simgrid::s4u::Activity::on_completion.connect([](simgrid::s4u::Activity& activity) { - auto* exec = dynamic_cast(&activity); + const auto* exec = dynamic_cast(&activity); if (exec == nullptr) // Only Execs are concerned here return; if (exec->get_host_number() == 1) { // We only run on one host diff --git a/src/plugins/vm/dirty_page_tracking.cpp b/src/plugins/vm/dirty_page_tracking.cpp index c128303f22..466c071178 100644 --- a/src/plugins/vm/dirty_page_tracking.cpp +++ b/src/plugins/vm/dirty_page_tracking.cpp @@ -94,7 +94,7 @@ static void on_exec_creation(simgrid::s4u::Exec const& e) static void on_exec_completion(simgrid::s4u::Activity& e) { - auto exec = dynamic_cast(e.get_impl()); + const auto exec = dynamic_cast(e.get_impl()); if (exec == nullptr) return; const simgrid::s4u::VirtualMachine* vm = dynamic_cast(exec->get_host()); diff --git a/src/s4u/s4u_Engine.cpp b/src/s4u/s4u_Engine.cpp index 6d73ea2d7d..0d1c8f8943 100644 --- a/src/s4u/s4u_Engine.cpp +++ b/src/s4u/s4u_Engine.cpp @@ -338,7 +338,7 @@ void Engine::run_until(double max_date) const } } -void Engine::track_vetoed_activities(std::set* vetoed_activities) +void Engine::track_vetoed_activities(std::set* vetoed_activities) const { Activity::set_vetoed_activities(vetoed_activities); } diff --git a/src/s4u/s4u_Exec.cpp b/src/s4u/s4u_Exec.cpp index c74229193b..e6723c4383 100644 --- a/src/s4u/s4u_Exec.cpp +++ b/src/s4u/s4u_Exec.cpp @@ -23,7 +23,7 @@ Exec::Exec(kernel::activity::ExecImplPtr pimpl) pimpl_ = pimpl; } -void Exec::reset() +void Exec::reset() const { boost::static_pointer_cast(pimpl_)->reset(); } diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp index 4fe0ac9985..1ffe713daf 100644 --- a/src/surf/HostImpl.cpp +++ b/src/surf/HostImpl.cpp @@ -99,7 +99,7 @@ void HostImpl::turn_off(const actor::ActorImpl* issuer) actor.get_host()->get_cname(), issuer->get_cname()); issuer->kill(&actor); } - for (auto& activity : EngineImpl::get_instance()->get_maestro()->activities_) { + for (const auto& activity : EngineImpl::get_instance()->get_maestro()->activities_) { auto* exec = dynamic_cast(activity.get()); if (exec != nullptr) { auto hosts = exec->get_hosts(); diff --git a/teshsuite/s4u/dependencies/dependencies.cpp b/teshsuite/s4u/dependencies/dependencies.cpp index 6a9cf63317..e846943021 100644 --- a/teshsuite/s4u/dependencies/dependencies.cpp +++ b/teshsuite/s4u/dependencies/dependencies.cpp @@ -14,7 +14,7 @@ int main(int argc, char** argv) e.load_platform(argv[1]); simgrid::s4u::Activity::on_completion.connect([](simgrid::s4u::Activity& activity) { - auto* exec = dynamic_cast(&activity); + const auto* exec = dynamic_cast(&activity); if (exec == nullptr) // Only Execs are concerned here return; XBT_INFO("Exec '%s' start time: %f, finish time: %f", exec->get_cname(), exec->get_start_time(), @@ -35,7 +35,7 @@ int main(int argc, char** argv) try { A->add_successor(A); - ; /* shouldn't work and must raise an exception */ + /* shouldn't work and must raise an exception */ xbt_die("Hey, I can add a dependency between A and A!"); } catch (const std::invalid_argument& e) { XBT_INFO("Caught attempt to self-dependency creation: %s", e.what()); -- 2.20.1