From 7f90173083cea6c05e9a2418bc11c47750d006d8 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 2 Jul 2020 17:50:58 +0200 Subject: [PATCH] [sonar] Declare functions "const" in src/kernel/. --- include/simgrid/kernel/future.hpp | 6 +++--- include/simgrid/kernel/resource/Model.hpp | 2 +- include/simgrid/kernel/routing/ClusterZone.hpp | 9 ++++++--- include/simgrid/kernel/routing/DragonflyZone.hpp | 5 +++-- include/simgrid/kernel/routing/FatTreeZone.hpp | 4 ++-- include/simgrid/kernel/routing/NetPoint.hpp | 2 +- include/simgrid/kernel/routing/RoutedZone.hpp | 4 ++-- src/kernel/EngineImpl.cpp | 2 +- src/kernel/EngineImpl.hpp | 4 ++-- src/kernel/activity/ActivityImpl.hpp | 6 +++--- src/kernel/activity/MutexImpl.hpp | 2 +- src/kernel/activity/SemaphoreImpl.hpp | 6 +++--- src/kernel/actor/ActorImpl.cpp | 6 +++--- src/kernel/actor/ActorImpl.hpp | 16 ++++++++-------- src/kernel/context/Context.hpp | 2 +- src/kernel/future.cpp | 2 +- src/kernel/resource/DiskImpl.hpp | 4 ++-- src/kernel/routing/DragonflyZone.cpp | 4 ++-- src/kernel/routing/FatTreeZone.cpp | 4 ++-- src/kernel/routing/RoutedZone.cpp | 4 ++-- 20 files changed, 49 insertions(+), 45 deletions(-) diff --git a/include/simgrid/kernel/future.hpp b/include/simgrid/kernel/future.hpp index 4891f133c3..906d702937 100644 --- a/include/simgrid/kernel/future.hpp +++ b/include/simgrid/kernel/future.hpp @@ -48,7 +48,7 @@ public: FutureStateBase(FutureStateBase const&) = delete; FutureStateBase& operator=(FutureStateBase const&) = delete; - XBT_PUBLIC void schedule(simgrid::xbt::Task&& job); + XBT_PUBLIC void schedule(simgrid::xbt::Task&& job) const; void set_exception(std::exception_ptr exception) { @@ -522,13 +522,13 @@ public: future_get_ = true; return Future(state_); } - void set_value() + void set_value() const { if (state_ == nullptr) throw std::future_error(std::future_errc::no_state); state_->set_value(); } - void set_exception(std::exception_ptr exception) + void set_exception(std::exception_ptr exception) const { if (state_ == nullptr) throw std::future_error(std::future_errc::no_state); diff --git a/include/simgrid/kernel/resource/Model.hpp b/include/simgrid/kernel/resource/Model.hpp index 63c2542029..ac5ccd72ef 100644 --- a/include/simgrid/kernel/resource/Model.hpp +++ b/include/simgrid/kernel/resource/Model.hpp @@ -34,7 +34,7 @@ public: virtual ~Model(); - bool is_update_lazy() { return update_algorithm_ == UpdateAlgo::LAZY; } + bool is_update_lazy() const { return update_algorithm_ == UpdateAlgo::LAZY; } /** @brief Get the set of [actions](@ref Action) in *inited* state */ Action::StateSet* get_inited_action_set() { return &inited_action_set_; } diff --git a/include/simgrid/kernel/routing/ClusterZone.hpp b/include/simgrid/kernel/routing/ClusterZone.hpp index e8e72c1253..f6ab794dfc 100644 --- a/include/simgrid/kernel/routing/ClusterZone.hpp +++ b/include/simgrid/kernel/routing/ClusterZone.hpp @@ -83,9 +83,12 @@ public: /* The pair is {link_up, link_down} */ std::unordered_map> private_links_; - unsigned int node_pos(int id) { return id * num_links_per_node_; } - unsigned int node_pos_with_loopback(int id) { return node_pos(id) + (has_loopback_ ? 1 : 0); } - unsigned int node_pos_with_loopback_limiter(int id) { return node_pos_with_loopback(id) + (has_limiter_ ? 1 : 0); } + unsigned int node_pos(int id) const { return id * num_links_per_node_; } + unsigned int node_pos_with_loopback(int id) const { return node_pos(id) + (has_loopback_ ? 1 : 0); } + unsigned int node_pos_with_loopback_limiter(int id) const + { + return node_pos_with_loopback(id) + (has_limiter_ ? 1 : 0); + } void* loopback_ = nullptr; kernel::resource::LinkImpl* backbone_ = nullptr; diff --git a/include/simgrid/kernel/routing/DragonflyZone.hpp b/include/simgrid/kernel/routing/DragonflyZone.hpp index adde19cf44..133fa77267 100644 --- a/include/simgrid/kernel/routing/DragonflyZone.hpp +++ b/include/simgrid/kernel/routing/DragonflyZone.hpp @@ -65,12 +65,13 @@ public: void parse_specific_arguments(ClusterCreationArgs* cluster) override; void seal() override; - void rankId_to_coords(int rank_id, unsigned int coords[4]); + void rankId_to_coords(int rank_id, unsigned int coords[4]) const; private: void generate_routers(); void generate_links(); - void create_link(const std::string& id, int numlinks, resource::LinkImpl** linkup, resource::LinkImpl** linkdown); + void create_link(const std::string& id, int numlinks, resource::LinkImpl** linkup, + resource::LinkImpl** linkdown) const; simgrid::s4u::Link::SharingPolicy sharing_policy_; double bw_ = 0; diff --git a/include/simgrid/kernel/routing/FatTreeZone.hpp b/include/simgrid/kernel/routing/FatTreeZone.hpp index ebf200b77f..683bd1fca7 100644 --- a/include/simgrid/kernel/routing/FatTreeZone.hpp +++ b/include/simgrid/kernel/routing/FatTreeZone.hpp @@ -138,8 +138,8 @@ private: void generate_labels(); void generate_switches(); int connect_node_to_parents(FatTreeNode* node); - bool are_related(FatTreeNode* parent, FatTreeNode* child); - bool is_in_sub_tree(FatTreeNode* root, FatTreeNode* node); + bool are_related(FatTreeNode* parent, FatTreeNode* child) const; + bool is_in_sub_tree(FatTreeNode* root, FatTreeNode* node) const; }; } // namespace routing } // namespace kernel diff --git a/include/simgrid/kernel/routing/NetPoint.hpp b/include/simgrid/kernel/routing/NetPoint.hpp index f73bfd582e..d413928519 100644 --- a/include/simgrid/kernel/routing/NetPoint.hpp +++ b/include/simgrid/kernel/routing/NetPoint.hpp @@ -32,7 +32,7 @@ public: ~NetPoint() = default; // Our rank in the vertices_ array of the netzone that contains us. - unsigned int id() { return id_; } + unsigned int id() const { return id_; } const std::string& get_name() const { return name_; } const char* get_cname() const { return name_.c_str(); } /** @brief the NetZone in which this NetPoint is included */ diff --git a/include/simgrid/kernel/routing/RoutedZone.hpp b/include/simgrid/kernel/routing/RoutedZone.hpp index 27ff684ba0..d338fc5200 100644 --- a/include/simgrid/kernel/routing/RoutedZone.hpp +++ b/include/simgrid/kernel/routing/RoutedZone.hpp @@ -59,9 +59,9 @@ protected: virtual RouteCreationArgs* new_extended_route(RoutingMode hierarchy, NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, std::vector& link_list, bool symmetrical, bool change_order); - void get_route_check_params(NetPoint* src, NetPoint* dst); + void get_route_check_params(NetPoint* src, NetPoint* dst) const; void add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - const std::vector& link_list, bool symmetrical); + const std::vector& link_list, bool symmetrical) const; }; } // namespace routing } // namespace kernel diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp index 28f993c4b7..8cf08b7afe 100644 --- a/src/kernel/EngineImpl.cpp +++ b/src/kernel/EngineImpl.cpp @@ -39,7 +39,7 @@ EngineImpl::~EngineImpl() kv.second->destroy(); } -void EngineImpl::load_deployment(const std::string& file) +void EngineImpl::load_deployment(const std::string& file) const { sg_platf_exit(); sg_platf_init(); diff --git a/src/kernel/EngineImpl.hpp b/src/kernel/EngineImpl.hpp index d730edebbd..2e385c759b 100644 --- a/src/kernel/EngineImpl.hpp +++ b/src/kernel/EngineImpl.hpp @@ -34,7 +34,7 @@ public: EngineImpl& operator=(const EngineImpl&) = delete; virtual ~EngineImpl(); - void load_deployment(const std::string& file); + void load_deployment(const std::string& file) const; void register_function(const std::string& name, const actor::ActorCodeFactory& code); void register_default(const actor::ActorCodeFactory& code); @@ -53,4 +53,4 @@ public: } // namespace kernel } // namespace simgrid -#endif \ No newline at end of file +#endif diff --git a/src/kernel/activity/ActivityImpl.hpp b/src/kernel/activity/ActivityImpl.hpp index fcda3304ff..28c5c843f8 100644 --- a/src/kernel/activity/ActivityImpl.hpp +++ b/src/kernel/activity/ActivityImpl.hpp @@ -54,8 +54,8 @@ protected: } public: - const std::string& get_name() { return name_; } - const char* get_cname() { return name_.c_str(); } + const std::string& get_name() const { return name_; } + const char* get_cname() const { return name_.c_str(); } bool test(); void wait_for(actor::ActorImpl* issuer, double timeout); @@ -100,7 +100,7 @@ public: tracing_category_ = category; return static_cast(*this); } - const std::string& get_tracing_category() { return tracing_category_; } + const std::string& get_tracing_category() const { return tracing_category_; } }; } // namespace activity diff --git a/src/kernel/activity/MutexImpl.hpp b/src/kernel/activity/MutexImpl.hpp index ba85ad0f9e..9a311b5bd6 100644 --- a/src/kernel/activity/MutexImpl.hpp +++ b/src/kernel/activity/MutexImpl.hpp @@ -30,7 +30,7 @@ public: void lock(actor::ActorImpl* issuer); bool try_lock(actor::ActorImpl* issuer); void unlock(actor::ActorImpl* issuer); - bool is_locked() { return locked_; } + bool is_locked() const { return locked_; } MutexImpl* ref(); void unref(); diff --git a/src/kernel/activity/SemaphoreImpl.hpp b/src/kernel/activity/SemaphoreImpl.hpp index 361c7cf217..c340db827e 100644 --- a/src/kernel/activity/SemaphoreImpl.hpp +++ b/src/kernel/activity/SemaphoreImpl.hpp @@ -30,11 +30,11 @@ public: void acquire(actor::ActorImpl* issuer, double timeout); void release(); - bool would_block() { return (value_ == 0); } + bool would_block() const { return (value_ == 0); } void remove_sleeping_actor(actor::ActorImpl& actor) { xbt::intrusive_erase(sleeping_, actor); } - unsigned int get_capacity() { return value_; } - bool is_used() { return not sleeping_.empty(); } + unsigned int get_capacity() const { return value_; } + bool is_used() const { return not sleeping_.empty(); } friend void intrusive_ptr_add_ref(SemaphoreImpl* sem) { diff --git a/src/kernel/actor/ActorImpl.cpp b/src/kernel/actor/ActorImpl.cpp index 4e0162f49e..1c9d773b31 100644 --- a/src/kernel/actor/ActorImpl.cpp +++ b/src/kernel/actor/ActorImpl.cpp @@ -227,7 +227,7 @@ void ActorImpl::exit() this->throw_exception(std::make_exception_ptr(ForcefulKillException(host_->is_on() ? "exited" : "host failed"))); } -void ActorImpl::kill(ActorImpl* actor) +void ActorImpl::kill(ActorImpl* actor) const { xbt_assert(actor != simix_global->maestro_, "Killing maestro is a rather bad idea"); if (actor->finished_) { @@ -252,7 +252,7 @@ void ActorImpl::kill(ActorImpl* actor) } } -void ActorImpl::kill_all() +void ActorImpl::kill_all() const { for (auto const& kv : simix_global->process_list) if (kv.second != this) @@ -454,7 +454,7 @@ void ActorImpl::set_host(s4u::Host* dest) dest->pimpl_->add_actor(this); } -ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) +ActorImplPtr ActorImpl::init(const std::string& name, s4u::Host* host) const { ActorImpl* actor = new ActorImpl(xbt::string(name), host); actor->set_ppid(this->pid_); diff --git a/src/kernel/actor/ActorImpl.hpp b/src/kernel/actor/ActorImpl.hpp index 276eb214e4..17b8042634 100644 --- a/src/kernel/actor/ActorImpl.hpp +++ b/src/kernel/actor/ActorImpl.hpp @@ -56,11 +56,11 @@ public: aid_t get_pid() const { return pid_; } aid_t get_ppid() const { return ppid_; } void set_ppid(aid_t ppid) { ppid_ = ppid; } - bool is_daemon() { return daemon_; } /** Whether this actor has been daemonized */ - bool has_to_auto_restart() { return auto_restart_; } + bool is_daemon() const { return daemon_; } /** Whether this actor has been daemonized */ + bool has_to_auto_restart() const { return auto_restart_; } void set_auto_restart(bool autorestart) { auto_restart_ = autorestart; } void set_stacksize(unsigned stacksize) { stacksize_ = stacksize; } - unsigned get_stacksize() { return stacksize_; } + unsigned get_stacksize() const { return stacksize_; } std::unique_ptr context_; /* the context (uctx/raw/thread) that executes the user function */ @@ -83,7 +83,7 @@ private: std::atomic_int_fast32_t refcount_{0}; public: - int get_refcount() { return refcount_; } + int get_refcount() const { return refcount_; } friend void intrusive_ptr_add_ref(ActorImpl* actor) { // This whole memory consistency semantic drives me nuts. @@ -117,7 +117,7 @@ public: s4u::ActorPtr iface() { return s4u::ActorPtr(&piface_); } s4u::Actor* ciface() { return &piface_; } - ActorImplPtr init(const std::string& name, s4u::Host* host); + ActorImplPtr init(const std::string& name, s4u::Host* host) const; ActorImpl* start(const ActorCode& code); static ActorImplPtr create(const std::string& name, const ActorCode& code, void* data, s4u::Host* host, @@ -127,12 +127,12 @@ public: static void detach(); void cleanup(); void exit(); - void kill(ActorImpl* actor); - void kill_all(); + void kill(ActorImpl* actor) const; + void kill_all() const; void yield(); void daemonize(); - bool is_suspended() { return suspended_; } + bool is_suspended() const { return suspended_; } s4u::Actor* restart(); void suspend(); void resume(); diff --git a/src/kernel/context/Context.hpp b/src/kernel/context/Context.hpp index 813856f1ef..7dc642024e 100644 --- a/src/kernel/context/Context.hpp +++ b/src/kernel/context/Context.hpp @@ -56,7 +56,7 @@ public: bool wannadie() const { return iwannadie_; } void set_wannadie(bool value = true) { iwannadie_ = value; } - void operator()() { code_(); } + void operator()() const { code_(); } bool has_code() const { return static_cast(code_); } actor::ActorImpl* get_actor() const { return this->actor_; } diff --git a/src/kernel/future.cpp b/src/kernel/future.cpp index 53ce0bd33a..9c190453df 100644 --- a/src/kernel/future.cpp +++ b/src/kernel/future.cpp @@ -13,7 +13,7 @@ namespace simgrid { namespace kernel { -void FutureStateBase::schedule(simgrid::xbt::Task&& job) +void FutureStateBase::schedule(simgrid::xbt::Task&& job) const { simix_global->tasks.push_back(std::move(job)); } diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp index 962dd9f999..11e4829e40 100644 --- a/src/kernel/resource/DiskImpl.hpp +++ b/src/kernel/resource/DiskImpl.hpp @@ -68,8 +68,8 @@ public: s4u::Host* get_host() const { return host_; } void set_host(s4u::Host* host) { host_ = host; } - double get_read_bandwidth() { return read_bw_; } - double get_write_bandwidth() { return write_bw_; } + double get_read_bandwidth() const { return read_bw_; } + double get_write_bandwidth() const { return write_bw_; } lmm::Constraint* get_read_constraint() const { return constraint_read_; } lmm::Constraint* get_write_constraint() const { return constraint_write_; } diff --git a/src/kernel/routing/DragonflyZone.cpp b/src/kernel/routing/DragonflyZone.cpp index 01d1da37a7..be88274f2f 100644 --- a/src/kernel/routing/DragonflyZone.cpp +++ b/src/kernel/routing/DragonflyZone.cpp @@ -23,7 +23,7 @@ DragonflyZone::DragonflyZone(NetZoneImpl* father, const std::string& name, resou { } -void DragonflyZone::rankId_to_coords(int rankId, unsigned int coords[4]) +void DragonflyZone::rankId_to_coords(int rankId, unsigned int coords[4]) const { // coords : group, chassis, blade, node coords[0] = rankId / (num_chassis_per_group_ * num_blades_per_chassis_ * num_nodes_per_blade_); @@ -133,7 +133,7 @@ void DragonflyZone::generate_routers() } void DragonflyZone::create_link(const std::string& id, int numlinks, resource::LinkImpl** linkup, - resource::LinkImpl** linkdown) + resource::LinkImpl** linkdown) const { *linkup = nullptr; *linkdown = nullptr; diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp index 820dfba65f..c7ac3d8d8b 100644 --- a/src/kernel/routing/FatTreeZone.cpp +++ b/src/kernel/routing/FatTreeZone.cpp @@ -38,7 +38,7 @@ FatTreeZone::~FatTreeZone() } } -bool FatTreeZone::is_in_sub_tree(FatTreeNode* root, FatTreeNode* node) +bool FatTreeZone::is_in_sub_tree(FatTreeNode* root, FatTreeNode* node) const { XBT_DEBUG("Is %d(%u,%u) in the sub tree of %d(%u,%u) ?", node->id, node->level, node->position, root->id, root->level, root->position); @@ -200,7 +200,7 @@ int FatTreeZone::connect_node_to_parents(FatTreeNode* node) return connectionsNumber; } -bool FatTreeZone::are_related(FatTreeNode* parent, FatTreeNode* child) +bool FatTreeZone::are_related(FatTreeNode* parent, FatTreeNode* child) const { std::stringstream msgBuffer; diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp index e9d4fb5ed0..b6b01f6ea5 100644 --- a/src/kernel/routing/RoutedZone.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -143,7 +143,7 @@ RouteCreationArgs* RoutedZone::new_extended_route(RoutingMode hierarchy, NetPoin return result; } -void RoutedZone::get_route_check_params(NetPoint* src, NetPoint* dst) +void RoutedZone::get_route_check_params(NetPoint* src, NetPoint* dst) const { xbt_assert(src, "Cannot find a route from nullptr to %s", dst->get_cname()); xbt_assert(dst, "Cannot find a route from %s to nullptr", src->get_cname()); @@ -161,7 +161,7 @@ void RoutedZone::get_route_check_params(NetPoint* src, NetPoint* dst) src->get_cname(), dst->get_cname(), src_as->get_cname(), dst_as->get_cname(), get_cname()); } void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - const std::vector& link_list, bool symmetrical) + const std::vector& link_list, bool symmetrical) const { const char* srcName = src->get_cname(); const char* dstName = dst->get_cname(); -- 2.20.1