X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1a5484101efbff9c8d982a0c4650f7953ee7e2f..72884f9c682441d0a9de0f2df63b47cde7822058:/src/kernel/resource/DiskImpl.cpp diff --git a/src/kernel/resource/DiskImpl.cpp b/src/kernel/resource/DiskImpl.cpp index 40391d1caf..fe2e269513 100644 --- a/src/kernel/resource/DiskImpl.cpp +++ b/src/kernel/resource/DiskImpl.cpp @@ -8,13 +8,16 @@ #include "simgrid/s4u/Engine.hpp" #include "src/kernel/EngineImpl.hpp" #include "src/kernel/lmm/maxmin.hpp" +#include "src/kernel/resource/profile/Profile.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_disk, ker_resource, "Disk resources, fuelling I/O activities"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_disk, ker_resource, "Disk resources, that fuel I/O activities"); namespace simgrid { namespace kernel { namespace resource { +xbt::signal DiskAction::on_state_change; + /********* * Model * *********/ @@ -27,22 +30,19 @@ DiskModel::DiskModel(const std::string& name) : Model(name) /************ * Resource * ************/ -DiskImpl* DiskImpl::set_host(s4u::Host* host) -{ - xbt_assert(host, "Cannot set host, none given"); - host_ = host; - return this; -} - -DiskImpl* DiskImpl::set_read_bandwidth(double read_bw) +DiskImpl::DiskImpl(const std::string& name, double read_bandwidth, double write_bandwidth) + : Resource_T(name), piface_(this) { - read_bw_ = read_bw; - return this; + read_bw_.peak = read_bandwidth; + read_bw_.scale = 1.0; + write_bw_.peak = write_bandwidth; + write_bw_.scale = 1.0; } -DiskImpl* DiskImpl::set_write_bandwidth(double write_bw) +DiskImpl* DiskImpl::set_host(s4u::Host* host) { - write_bw_ = write_bw; + xbt_assert(host, "Cannot set host, none given"); + host_ = host; return this; } @@ -64,7 +64,7 @@ DiskImpl* DiskImpl::set_write_constraint(lmm::Constraint* constraint_write) */ void DiskImpl::destroy() { - s4u::Disk::on_destruction(this->piface_); + s4u::Disk::on_destruction(piface_); delete this; } @@ -73,47 +73,109 @@ bool DiskImpl::is_used() const return get_model()->get_maxmin_system()->constraint_used(get_constraint()); } -void DiskImpl::apply_event(kernel::profile::Event* /*event*/, double /*value*/) -{ - THROW_UNIMPLEMENTED; -} - void DiskImpl::turn_on() { if (not is_on()) { Resource::turn_on(); - s4u::Disk::on_state_change(this->piface_); + s4u::Disk::on_state_change(piface_); } } void DiskImpl::turn_off() { if (is_on()) { Resource::turn_off(); - s4u::Disk::on_state_change(this->piface_); + s4u::Disk::on_state_change(piface_); } } +DiskImpl* DiskImpl::set_read_bandwidth_profile(profile::Profile* profile) +{ + if (profile) { + xbt_assert(read_bw_.event == nullptr, "Cannot set a second read bandwidth profile to Disk %s", get_cname()); + read_bw_.event = profile->schedule(&profile::future_evt_set, this); + } + return this; +} + +DiskImpl* DiskImpl::set_write_bandwidth_profile(profile::Profile* profile) +{ + if (profile) { + xbt_assert(write_bw_.event == nullptr, "Cannot set a second read bandwidth profile to Disk %s", get_cname()); + write_bw_.event = profile->schedule(&profile::future_evt_set, this); + } + return this; +} + void DiskImpl::seal() { - xbt_assert(this->get_model(), "Cannot seal Disk (%s) without setting the model first", this->get_cname()); + if (is_sealed()) + return; + + xbt_assert(this->get_model(), "Cannot seal Disk (%s) without setting the model first", get_cname()); lmm::System* maxmin_system = get_model()->get_maxmin_system(); - this->set_read_constraint(maxmin_system->constraint_new(this, read_bw_)) - ->set_write_constraint(maxmin_system->constraint_new(this, write_bw_)) - ->set_constraint(maxmin_system->constraint_new(this, std::max(read_bw_, write_bw_))); - XBT_DEBUG("Create resource with read_bw '%f' write_bw '%f'", read_bw_, write_bw_); + /* set readwrite constraint if not configured by user */ + if (readwrite_bw_ == -1) { + readwrite_bw_ = std::max(read_bw_.peak, write_bw_.peak); + } + this->set_read_constraint(maxmin_system->constraint_new(this, read_bw_.peak * read_bw_.scale)) + ->set_write_constraint(maxmin_system->constraint_new(this, write_bw_.peak * write_bw_.scale)) + ->set_constraint(maxmin_system->constraint_new(this, readwrite_bw_)); + apply_sharing_policy_cfg(); + XBT_DEBUG("Create resource with read_bw '%f' write_bw '%f'", read_bw_.peak, write_bw_.peak); Resource::seal(); turn_on(); } -xbt::signal DiskAction::on_state_change; + +constexpr kernel::lmm::Constraint::SharingPolicy to_maxmin_policy(s4u::Disk::SharingPolicy policy) +{ + kernel::lmm::Constraint::SharingPolicy lmm_policy = kernel::lmm::Constraint::SharingPolicy::SHARED; + if (policy == s4u::Disk::SharingPolicy::NONLINEAR) + lmm_policy = kernel::lmm::Constraint::SharingPolicy::NONLINEAR; + return lmm_policy; +} + +void DiskImpl::set_sharing_policy(s4u::Disk::Operation op, s4u::Disk::SharingPolicy policy, + const s4u::NonLinearResourceCb& cb) +{ + sharing_policy_[op] = policy; + sharing_policy_cb_[op] = cb; + apply_sharing_policy_cfg(); +} + +s4u::Disk::SharingPolicy DiskImpl::get_sharing_policy(s4u::Disk::Operation op) const +{ + return sharing_policy_.at(op); +} + +void DiskImpl::apply_sharing_policy_cfg() +{ + if (get_constraint()) + get_constraint()->set_sharing_policy(to_maxmin_policy(sharing_policy_[s4u::Disk::Operation::READWRITE]), + sharing_policy_cb_[s4u::Disk::Operation::READWRITE]); + if (constraint_read_) + constraint_read_->set_sharing_policy(to_maxmin_policy(sharing_policy_[s4u::Disk::Operation::READ]), + sharing_policy_cb_[s4u::Disk::Operation::READ]); + if (constraint_write_) + constraint_write_->set_sharing_policy(to_maxmin_policy(sharing_policy_[s4u::Disk::Operation::WRITE]), + sharing_policy_cb_[s4u::Disk::Operation::WRITE]); +} + +void DiskImpl::set_factor_cb(const std::function& cb) +{ + xbt_assert(not is_sealed(), "Cannot set I/O factor callback in an already sealed disk(%s)", get_cname()); + factor_cb_ = cb; +} /********** * Action * **********/ -void DiskAction::set_state(Action::State state) +void DiskAction::set_state(Action::State new_state) { - Action::State old = get_state(); - Action::set_state(state); - on_state_change(*this, old, state); + Action::State previous_state = get_state(); + if (new_state != previous_state) { // Trigger only if the state changed + Action::set_state(new_state); + on_state_change(*this, previous_state, new_state); + } } } // namespace resource } // namespace kernel