X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b4e5a12b9e11e584c2c5af4d96e38b8220a72b9..7d195832dafde68afd749dd614e9a14d697bdb92:/include/simgrid/s4u/Host.hpp diff --git a/include/simgrid/s4u/Host.hpp b/include/simgrid/s4u/Host.hpp index b23efc3c63..cd0797a68a 100644 --- a/include/simgrid/s4u/Host.hpp +++ b/include/simgrid/s4u/Host.hpp @@ -45,6 +45,9 @@ class XBT_PUBLIC Host : public xbt::Extendable { // The private implementation, that never changes surf::HostImpl* const pimpl_; + kernel::resource::CpuImpl* pimpl_cpu_ = nullptr; + kernel::routing::NetPoint* pimpl_netpoint_ = nullptr; + public: explicit Host(surf::HostImpl* pimpl) : pimpl_(pimpl) {} @@ -83,9 +86,24 @@ public: /** Retrieves the name of that host as a C string */ const char* get_cname() const; + Host* set_cpu(kernel::resource::CpuImpl* cpu); + kernel::resource::CpuImpl* get_cpu() const { return pimpl_cpu_; } kernel::routing::NetPoint* get_netpoint() const { return pimpl_netpoint_; } + /** + * @brief Callback to set CPU factor + * + * This callback offers a flexible way to create variability in CPU executions + * + * @param flops Execution size in flops + * @return Multiply factor + */ + using CpuFactorCb = double(double flops); + /** + * @brief Configure the factor callback to the CPU associated to this host + */ + Host* set_factor_cb(const std::function& cb); - int get_actor_count() const; + size_t get_actor_count() const; std::vector get_all_actors() const; /** Turns that host on if it was previously off @@ -111,13 +129,19 @@ public: Host* set_state_profile(kernel::profile::Profile* p); Host* set_speed_profile(kernel::profile::Profile* p); + /** @brief Convert the CPU's speed from string to double */ + static std::vector convert_pstate_speed_vector(const std::vector& speed_per_state); /** * @brief Set the CPU's speed * * @param speed_per_state list of powers for this processor (default power is at index 0) */ Host* set_pstate_speed(const std::vector& speed_per_state); - /** @brief Set the CPU's speed (string version) */ + /** + * @brief Set the CPU's speed (string version) + * + * @throw std::invalid_argument if speed format is incorrect. + */ Host* set_pstate_speed(const std::vector& speed_per_state); /** @brief Get the peak computing speed in flops/s at the current pstate, NOT taking the external load into account. @@ -125,7 +149,7 @@ public: * The amount of flops per second available for computing depends on several things: * - The current pstate determines the maximal peak computing speed (use @ref get_pstate_speed() to retrieve the * computing speed you would get at another pstate) - * - If you declared an external load (with @ref simgrid::surf::Cpu::set_speed_profile()), you must multiply the + * - If you declared an external load (with @ref set_speed_profile()), you must multiply the * result of get_speed() by get_available_speed() to retrieve what a new computation would get. * * The remaining speed is then shared between the executions located on this host. @@ -138,7 +162,7 @@ public: double get_speed() const; /** @brief Get the available speed ratio, between 0 and 1. * - * This accounts for external load (see @ref simgrid::surf::Cpu::set_speed_profile()). + * This accounts for external load (see @ref set_speed_profile()). */ double get_available_speed() const; @@ -146,6 +170,16 @@ public: int get_core_count() const; Host* set_core_count(int core_count); + enum class SharingPolicy { NONLINEAR = 1, LINEAR = 0 }; + /** + * @brief Describes how the CPU is shared between concurrent tasks + * + * @param policy Sharing policy + * @param cb Callback for NONLINEAR policies + */ + Host* set_sharing_policy(SharingPolicy policy, const s4u::NonLinearResourceCb& cb = {}); + SharingPolicy get_sharing_policy() const; + /** Returns the current computation load (in flops per second) * * The external load (coming from an availability trace) is not taken in account. @@ -153,28 +187,46 @@ public: */ double get_load() const; - int get_pstate_count() const; + unsigned long get_pstate_count() const; int get_pstate() const; - double get_pstate_speed(int pstate_index) const; - Host* set_pstate(int pstate_index); + double get_pstate_speed(unsigned long pstate_index) const; + Host* set_pstate(unsigned long pstate_index); + Host* set_coordinates(const std::string& coords); std::vector get_disks() const; + /** + * @brief Create and add disk in the host + * + * @param name Disk name + * @param read_bandwidth Reading speed of the disk + * @param write_bandwidth Writing speed of the disk + */ Disk* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth); + /** + * @brief Human-friendly version of create_disk function. + * + * @throw std::invalid_argument if read/write speeds are incorrect + */ + Disk* create_disk(const std::string& name, const std::string& read_bandwidth, const std::string& write_bandwidth); void add_disk(const Disk* disk); void remove_disk(const std::string& disk_name); void route_to(const Host* dest, std::vector& links, double* latency) const; void route_to(const Host* dest, std::vector& links, double* latency) const; + /** + * @brief Seal this host + * No more configuration is allowed after the seal + */ + Host* seal(); + #ifndef DOXYGEN XBT_ATTRIB_DEPRECATED_v331("Please use Comm::sendto()") void sendto(Host* dest, double byte_amount); - XBT_ATTRIB_DEPRECATED_v331("Please use Comm::sendto_async()") CommPtr sendto_async(Host* dest, double byte_amount); - XBT_ATTRIB_DEPRECATED_v330("Please use Host::sendto()") void send_to(Host* dest, double byte_amount); #endif - NetZone* get_englobing_zone(); + NetZone* get_englobing_zone() const; /** Block the calling actor on an execution located on the called host * * It is not a problem if the actor is not located on the called host. @@ -188,15 +240,6 @@ public: /** Block the calling actor on an execution located on the called host (with explicit priority) */ void execute(double flops, double priority) const; surf::HostImpl* get_impl() const { return pimpl_; } - -private: - kernel::routing::NetPoint* pimpl_netpoint_ = nullptr; - -public: -#ifndef DOXYGEN - /** DO NOT USE DIRECTLY (@todo: these should be protected, once our code is clean) */ - kernel::resource::Cpu* pimpl_cpu = nullptr; -#endif }; } // namespace s4u } // namespace simgrid