X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bfa4e95e4538099a54c5afedd403264c8d99adb6..7207080bb744f50a6d8c418f25d82ad69e9b4f44:/src/kernel/resource/Resource.cpp diff --git a/src/kernel/resource/Resource.cpp b/src/kernel/resource/Resource.cpp index 0a448dba9e..a8e7f5d7e4 100644 --- a/src/kernel/resource/Resource.cpp +++ b/src/kernel/resource/Resource.cpp @@ -5,74 +5,25 @@ #include "simgrid/kernel/resource/Resource.hpp" #include "src/kernel/lmm/maxmin.hpp" // Constraint +#include "src/kernel/resource/profile/FutureEvtSet.hpp" +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/surf_interface.hpp" -#include "src/surf/trace_mgr.hpp" namespace simgrid { namespace kernel { namespace resource { -Resource::Resource(Model* model, const std::string& name, lmm::Constraint* constraint) - : name_(name), model_(model), constraint_(constraint) -{ -} - Resource::~Resource() = default; -bool Resource::is_on() const -{ - return is_on_; -} -bool Resource::is_off() const -{ - return not is_on_; -} - -void Resource::turn_on() -{ - is_on_ = true; -} - -void Resource::turn_off() -{ - is_on_ = false; -} - -double Resource::get_load() +double Resource::get_load() const { return constraint_->get_usage(); } -Model* Resource::get_model() const -{ - return model_; -} - -const std::string& Resource::get_name() const -{ - return name_; -} - -const char* Resource::get_cname() const -{ - return name_.c_str(); -} - -bool Resource::operator==(const Resource& other) const -{ - return name_ == other.name_; -} - void Resource::set_state_profile(profile::Profile* profile) { xbt_assert(state_event_ == nullptr, "Cannot set a second state profile to %s", get_cname()); - - state_event_ = future_evt_set.add_trace(profile, this); -} - -kernel::lmm::Constraint* Resource::get_constraint() const -{ - return constraint_; + state_event_ = profile->schedule(&profile::future_evt_set, this); } } // namespace resource