X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ed98d31c172001583f905cfbabaab636651169c..f9b13d923d31bb0336aeeaab6d5b7ba33812f3f7:/src/kernel/resource/DiskImpl.hpp diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp index 60032910e5..c9f732e3d1 100644 --- a/src/kernel/resource/DiskImpl.hpp +++ b/src/kernel/resource/DiskImpl.hpp @@ -1,27 +1,25 @@ -/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2019-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/kernel/resource/Action.hpp" #include "simgrid/kernel/resource/Model.hpp" -#include "simgrid/kernel/resource/Resource.hpp" #include "simgrid/s4u/Disk.hpp" #include "simgrid/s4u/Io.hpp" +#include "src/kernel/resource/Resource.hpp" #include "src/surf/surf_interface.hpp" -#include +#include "xbt/PropertyHolder.hpp" #include -#ifndef DISK_INTERFACE_HPP_ -#define DISK_INTERFACE_HPP_ +#ifndef DISK_IMPL_HPP_ +#define DISK_IMPL_HPP_ /********* * Model * *********/ -XBT_PUBLIC_DATA simgrid::kernel::resource::DiskModel* surf_disk_model; - namespace simgrid { namespace kernel { namespace resource { @@ -36,48 +34,57 @@ class DiskAction; *********/ class DiskModel : public Model { public: - DiskModel(); + explicit DiskModel(const std::string& name); DiskModel(const DiskModel&) = delete; DiskModel& operator=(const DiskModel&) = delete; - ~DiskModel() override; virtual DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) = 0; + + virtual DiskAction* io_start(const DiskImpl* disk, sg_size_t size, s4u::Io::OpType type) = 0; }; /************ * Resource * ************/ -class DiskImpl : public Resource, public xbt::PropertyHolder { - s4u::Host* host_ = nullptr; +class DiskImpl : public Resource_T, public xbt::PropertyHolder { s4u::Disk piface_; - double read_bw_ = -1.0; - double write_bw_ = 1.0; + s4u::Host* host_ = nullptr; lmm::Constraint* constraint_write_ = nullptr; /* Constraint for maximum write bandwidth*/ - lmm::Constraint* constraint_read_ = nullptr; /* Constraint for maximum read bandwidth*/ + lmm::Constraint* constraint_read_ = nullptr; /* Constraint for maximum read bandwidth*/ + std::unordered_map sharing_policy_ = { + {s4u::Disk::Operation::READ, s4u::Disk::SharingPolicy::LINEAR}, + {s4u::Disk::Operation::WRITE, s4u::Disk::SharingPolicy::LINEAR}, + {s4u::Disk::Operation::READWRITE, s4u::Disk::SharingPolicy::LINEAR}}; + std::unordered_map sharing_policy_cb_ = {}; + std::function factor_cb_ = {}; + + void apply_sharing_policy_cfg(); protected: ~DiskImpl() override = default; // Disallow direct deletion. Call destroy() instead. public: - DiskImpl(const std::string& name, double read_bandwidth, double write_bandwidth) - : Resource(name), - piface_(name, this), - read_bw_(read_bandwidth), - write_bw_(write_bandwidth){} + Metric read_bw_ = {0.0, 0, nullptr}; + Metric write_bw_ = {0.0, 0, nullptr}; + double readwrite_bw_ = -1; /* readwrite constraint bound, usually max(read, write) */ + + explicit DiskImpl(const std::string& name, double read_bandwidth, double write_bandwidth); DiskImpl(const DiskImpl&) = delete; DiskImpl& operator=(const DiskImpl&) = delete; /** @brief Public interface */ const s4u::Disk* get_iface() const { return &piface_; } s4u::Disk* get_iface() { return &piface_; } + DiskImpl* set_host(s4u::Host* host); s4u::Host* get_host() const { return host_; } - void set_host(s4u::Host* host) { host_ = host; } - DiskImpl* set_read_bandwidth(double read_bw); - double get_read_bandwidth() const { return read_bw_; } + virtual void set_read_bandwidth(double read_bw) = 0; + double get_read_bandwidth() const { return read_bw_.peak * read_bw_.scale; } + + virtual void set_write_bandwidth(double write_bw) = 0; + double get_write_bandwidth() const { return write_bw_.peak * write_bw_.scale; } - DiskImpl* set_write_bandwidth(double write_bw); - double get_write_bandwidth() const { return write_bw_; } + virtual void set_readwrite_bandwidth(double bw) = 0; DiskImpl* set_read_constraint(lmm::Constraint* constraint_read); lmm::Constraint* get_read_constraint() const { return constraint_read_; } @@ -85,17 +92,20 @@ public: DiskImpl* set_write_constraint(lmm::Constraint* constraint_write); lmm::Constraint* get_write_constraint() const { return constraint_write_; } - /** @brief Check if the Disk is used (if an action currently uses its resources) */ - bool is_used() const override; - void apply_event(profile::Event* event, double value) override; + DiskImpl* set_read_bandwidth_profile(profile::Profile* profile); + DiskImpl* set_write_bandwidth_profile(profile::Profile* profile); + + void set_sharing_policy(s4u::Disk::Operation op, s4u::Disk::SharingPolicy policy, const s4u::NonLinearResourceCb& cb); + s4u::Disk::SharingPolicy get_sharing_policy(s4u::Disk::Operation op) const; + + void set_factor_cb(const std::function& cb); + const std::function& get_factor_cb() const { return factor_cb_; } + void turn_on() override; void turn_off() override; - void seal(); + void seal() override; void destroy(); // Must be called instead of the destructor - virtual DiskAction* io_start(sg_size_t size, s4u::Io::OpType type) = 0; - virtual DiskAction* read(sg_size_t size) = 0; - virtual DiskAction* write(sg_size_t size) = 0; }; /********** @@ -106,30 +116,11 @@ class DiskAction : public Action { public: static xbt::signal on_state_change; - DiskAction(Model* model, double cost, bool failed, DiskImpl* disk, s4u::Io::OpType type) - : Action(model, cost, failed), type_(type), disk_(disk){}; - - /** - * @brief diskAction constructor - * - * @param model The DiskModel associated to this DiskAction - * @param cost The cost of this DiskAction in bytes - * @param failed [description] - * @param var The lmm variable associated to this DiskAction if it is part of a LMM component - * @param disk The Disk associated to this DiskAction - * @param type [description] - */ - DiskAction(kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var, DiskImpl* disk, - s4u::Io::OpType type) - : Action(model, cost, failed, var), type_(type), disk_(disk){}; - + using Action::Action; void set_state(simgrid::kernel::resource::Action::State state) override; - - s4u::Io::OpType type_; - DiskImpl* disk_; }; } // namespace resource } // namespace kernel } // namespace simgrid -#endif /* DISK_INTERFACE_HPP_ */ +#endif /* DISK_IMPL_HPP_ */