X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..cc12fd6403964b251d1e253b99bdedeb6086a242:/src/kernel/resource/Resource.cpp diff --git a/src/kernel/resource/Resource.cpp b/src/kernel/resource/Resource.cpp index 427a6b1aa9..bcab6dbc16 100644 --- a/src/kernel/resource/Resource.cpp +++ b/src/kernel/resource/Resource.cpp @@ -6,6 +6,7 @@ #include "simgrid/kernel/resource/Resource.hpp" #include "src/kernel/lmm/maxmin.hpp" // Constraint #include "src/surf/surf_interface.hpp" +#include "src/surf/trace_mgr.hpp" namespace simgrid { namespace kernel { @@ -18,41 +19,41 @@ Resource::Resource(Model* model, const std::string& name, lmm::Constraint* const Resource::~Resource() = default; -bool Resource::isOn() const +bool Resource::is_on() const { return is_on_; } -bool Resource::isOff() const +bool Resource::is_off() const { return not is_on_; } -void Resource::turnOn() +void Resource::turn_on() { is_on_ = true; } -void Resource::turnOff() +void Resource::turn_off() { is_on_ = false; } -double Resource::getLoad() +double Resource::get_load() { return constraint_->get_usage(); } -Model* Resource::model() const +Model* Resource::get_model() const { return model_; } -const std::string& Resource::getName() const +const std::string& Resource::get_name() const { return name_; } -const char* Resource::getCname() const +const char* Resource::get_cname() const { return name_.c_str(); } @@ -62,7 +63,14 @@ bool Resource::operator==(const Resource& other) const return name_ == other.name_; } -kernel::lmm::Constraint* Resource::constraint() const +void Resource::set_state_trace(tmgr_trace_t trace) +{ + xbt_assert(state_event_ == nullptr, "Cannot set a second state trace to %s", get_cname()); + + state_event_ = future_evt_set->add_trace(trace, this); +} + +kernel::lmm::Constraint* Resource::get_constraint() const { return constraint_; }