From fa4076fe495b91c58d1f6a3cdbbb3cb95b39a4bd Mon Sep 17 00:00:00 2001 From: SUTER Frederic Date: Tue, 26 Oct 2021 14:52:16 +0200 Subject: [PATCH] refactor Resource::is_used() --- include/simgrid/kernel/resource/Resource.hpp | 7 ++++--- src/kernel/resource/DiskImpl.cpp | 5 ----- src/kernel/resource/DiskImpl.hpp | 2 -- src/surf/LinkImpl.cpp | 5 ----- src/surf/LinkImpl.hpp | 3 --- src/surf/cpu_cas01.cpp | 5 ----- src/surf/cpu_cas01.hpp | 2 -- src/surf/ptask_L07.cpp | 10 ---------- src/surf/ptask_L07.hpp | 2 -- 9 files changed, 4 insertions(+), 37 deletions(-) diff --git a/include/simgrid/kernel/resource/Resource.hpp b/include/simgrid/kernel/resource/Resource.hpp index f1edd894f6..2c1bcc1014 100644 --- a/include/simgrid/kernel/resource/Resource.hpp +++ b/include/simgrid/kernel/resource/Resource.hpp @@ -52,13 +52,12 @@ public: /** @brief Apply an event of external load event to that resource */ virtual void apply_event(profile::Event* event, double value) = 0; - /** @brief Check if the current Resource is used (if it currently serves an action) */ - virtual bool is_used() const = 0; - /** @brief Check if the current Resource is active */ virtual bool is_on() const { return is_on_; } virtual bool is_sealed() const { return sealed_; } + /** @brief Check if the current Resource is used (if it currently serves an action) */ + virtual bool is_used() const = 0; /** @brief Turn on the current Resource */ virtual void turn_on() { is_on_ = true; } /** @brief Turn off the current Resource */ @@ -102,6 +101,8 @@ public: * * The load due to external usages modeled by profile files is ignored.*/ virtual double get_load() const { return constraint_->get_usage(); } + + bool is_used() const override { return model_->get_maxmin_system()->constraint_used(constraint_); } }; } // namespace resource diff --git a/src/kernel/resource/DiskImpl.cpp b/src/kernel/resource/DiskImpl.cpp index fe2e269513..e3781ab04c 100644 --- a/src/kernel/resource/DiskImpl.cpp +++ b/src/kernel/resource/DiskImpl.cpp @@ -68,11 +68,6 @@ void DiskImpl::destroy() delete this; } -bool DiskImpl::is_used() const -{ - return get_model()->get_maxmin_system()->constraint_used(get_constraint()); -} - void DiskImpl::turn_on() { if (not is_on()) { diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp index 0351e1dc8e..5735d8dc8c 100644 --- a/src/kernel/resource/DiskImpl.hpp +++ b/src/kernel/resource/DiskImpl.hpp @@ -101,8 +101,6 @@ public: void set_factor_cb(const std::function& cb); const std::function& get_factor_cb() const { return factor_cb_; } - /** @brief Check if the Disk is used (if an action currently uses its resources) */ - bool is_used() const override; void turn_on() override; void turn_off() override; diff --git a/src/surf/LinkImpl.cpp b/src/surf/LinkImpl.cpp index d97bc34f65..43a24b29ca 100644 --- a/src/surf/LinkImpl.cpp +++ b/src/surf/LinkImpl.cpp @@ -39,11 +39,6 @@ void LinkImpl::destroy() delete this; } -bool LinkImpl::is_used() const -{ - return get_model()->get_maxmin_system()->constraint_used(get_constraint()); -} - constexpr kernel::lmm::Constraint::SharingPolicy to_maxmin_policy(s4u::Link::SharingPolicy policy) { switch (policy) { diff --git a/src/surf/LinkImpl.hpp b/src/surf/LinkImpl.hpp index d5608798e4..bd67a523f6 100644 --- a/src/surf/LinkImpl.hpp +++ b/src/surf/LinkImpl.hpp @@ -54,9 +54,6 @@ public: void set_sharing_policy(s4u::Link::SharingPolicy policy, const s4u::NonLinearResourceCb& cb) override; s4u::Link::SharingPolicy get_sharing_policy() const override; - /** @brief Check if the Link is used */ - bool is_used() const override; - void turn_on() override; void turn_off() override; diff --git a/src/surf/cpu_cas01.cpp b/src/surf/cpu_cas01.cpp index a17b5dfbb6..78a6573101 100644 --- a/src/surf/cpu_cas01.cpp +++ b/src/surf/cpu_cas01.cpp @@ -79,11 +79,6 @@ CpuImpl* CpuCas01Model::create_cpu(s4u::Host* host, const std::vector& s /************ * Resource * ************/ -bool CpuCas01::is_used() const -{ - return get_model()->get_maxmin_system()->constraint_used(get_constraint()); -} - /** @brief take into account changes of speed (either load or max) */ void CpuCas01::on_speed_change() { diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp index 66561982bf..3a027b45bf 100644 --- a/src/surf/cpu_cas01.hpp +++ b/src/surf/cpu_cas01.hpp @@ -51,8 +51,6 @@ public: CpuAction* sleep(double duration) override; void set_factor_cb(const std::function& cb) override; - bool is_used() const override; - protected: void on_speed_change() override; }; diff --git a/src/surf/ptask_L07.cpp b/src/surf/ptask_L07.cpp index 593ca1e63f..c2bb74f865 100644 --- a/src/surf/ptask_L07.cpp +++ b/src/surf/ptask_L07.cpp @@ -280,11 +280,6 @@ kernel::resource::CpuAction* CpuL07::sleep(double duration) return action; } -bool CpuL07::is_used() const -{ - return get_model()->get_maxmin_system()->constraint_used(get_constraint()); -} - /** @brief take into account changes of speed (either load or max) */ void CpuL07::on_speed_change() { @@ -306,11 +301,6 @@ LinkL07::LinkL07(const std::string& name, double bandwidth, kernel::lmm::System* bandwidth_.peak = bandwidth; } -bool LinkL07::is_used() const -{ - return get_model()->get_maxmin_system()->constraint_used(get_constraint()); -} - void CpuL07::apply_event(kernel::profile::Event* triggered, double value) { XBT_DEBUG("Updating cpu %s (%p) with value %g", get_cname(), this, value); diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp index 0b65d2bc89..9b52893b41 100644 --- a/src/surf/ptask_L07.hpp +++ b/src/surf/ptask_L07.hpp @@ -90,7 +90,6 @@ public: CpuL07(const CpuL07&) = delete; CpuL07& operator=(const CpuL07&) = delete; - bool is_used() const override; void apply_event(kernel::profile::Event* event, double value) override; kernel::resource::CpuAction* execution_start(double size, double user_bound) override; kernel::resource::CpuAction* execution_start(double, int, double) override @@ -110,7 +109,6 @@ public: LinkL07(const LinkL07&) = delete; LinkL07& operator=(const LinkL07&) = delete; ~LinkL07() override; - bool is_used() const override; void apply_event(kernel::profile::Event* event, double value) override; void set_bandwidth(double value) override; void set_latency(double value) override; -- 2.20.1