X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc4eceb15c80a597e44222b8c0ff60caf85db959..bc32dc8200e58f87951a43bf5ba56bf116f08e62:/src/surf/ptask_L07.hpp diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp index c5781cf02e..7187117ce1 100644 --- a/src/surf/ptask_L07.hpp +++ b/src/surf/ptask_L07.hpp @@ -1,18 +1,19 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2021. 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 "src/surf/HostImpl.hpp" #include #include #include -#include "src/surf/HostImpl.hpp" #ifndef HOST_L07_HPP_ #define HOST_L07_HPP_ namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /*********** * Classes * @@ -26,84 +27,87 @@ class XBT_PRIVATE CpuL07; class XBT_PRIVATE LinkL07; class XBT_PRIVATE L07Action; -/********* - * Tools * - *********/ /********* * Model * *********/ class HostL07Model : public HostModel { public: - HostL07Model(); + explicit HostL07Model(const std::string& name); HostL07Model(const HostL07Model&) = delete; HostL07Model& operator=(const HostL07Model&) = delete; - ~HostL07Model() override; - double next_occuring_event(double now) override; + double next_occurring_event(double now) override; void update_actions_state(double now, double delta) override; - kernel::resource::Action* execute_parallel(size_t host_nb, s4u::Host* const* host_list, const double* flops_amount, - const double* bytes_amount, double rate) override; + CpuAction* execute_parallel(const std::vector& host_list, const double* flops_amount, + const double* bytes_amount, double rate) override; }; class CpuL07Model : public CpuModel { public: - CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys); + CpuL07Model(const std::string& name, HostL07Model* hmodel, lmm::System* sys); CpuL07Model(const CpuL07Model&) = delete; CpuL07Model& operator=(const CpuL07Model&) = delete; - ~CpuL07Model(); - - Cpu* create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) override; - HostL07Model *hostModel_; + ~CpuL07Model() override; + void update_actions_state(double /*now*/, double /*delta*/) override{ + /* this action is done by HostL07Model which shares the LMM system with the CPU model + * Overriding to an empty function here allows us to handle the Cpu07Model as a regular + * method in EngineImpl::presolve */ + }; + + CpuImpl* create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) override; + HostL07Model* hostModel_; }; -class NetworkL07Model : public kernel::resource::NetworkModel { +class NetworkL07Model : public NetworkModel { public: - NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys); + NetworkL07Model(const std::string& name, HostL07Model* hmodel, lmm::System* sys); NetworkL07Model(const NetworkL07Model&) = delete; NetworkL07Model& operator=(const NetworkL07Model&) = delete; - ~NetworkL07Model(); - kernel::resource::LinkImpl* create_link(const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy) override; - - kernel::resource::Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; - - HostL07Model *hostModel_; + ~NetworkL07Model() override; + LinkImpl* create_link(const std::string& name, const std::vector& bandwidths) final; + LinkImpl* create_wifi_link(const std::string& name, const std::vector& bandwidths) override; + + Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override; + void update_actions_state(double /*now*/, double /*delta*/) override{ + /* this action is done by HostL07Model which shares the LMM system with the CPU model + * Overriding to an empty function here allows us to handle the Cpu07Model as a regular + * method in EngineImpl::presolve */ + }; + + HostL07Model* hostModel_; }; /************ * Resource * ************/ -class CpuL07 : public Cpu { +class CpuL07 : public CpuImpl { public: - CpuL07(CpuL07Model* model, s4u::Host* host, std::vector* speed_per_pstate, int core); + using CpuImpl::CpuImpl; CpuL07(const CpuL07&) = delete; CpuL07& operator=(const CpuL07&) = delete; - ~CpuL07() override; - bool is_used() override; - void apply_event(kernel::profile::Event* event, double value) override; - kernel::resource::Action* execution_start(double size) override; - kernel::resource::Action* execution_start(double, int) override + + void apply_event(profile::Event* event, double value) override; + CpuAction* execution_start(double size, double user_bound) override; + CpuAction* execution_start(double, int, double) override { THROW_UNIMPLEMENTED; return nullptr; } - kernel::resource::Action* sleep(double duration) override; + CpuAction* sleep(double duration) override; protected: void on_speed_change() override; }; -class LinkL07 : public kernel::resource::LinkImpl { +class LinkL07 : public LinkImpl { public: - LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy); + LinkL07(const std::string& name, double bandwidth, lmm::System* system); LinkL07(const LinkL07&) = delete; LinkL07& operator=(const LinkL07&) = delete; ~LinkL07() override; - bool is_used() override; - void apply_event(kernel::profile::Event* event, double value) override; + void apply_event(profile::Event* event, double value) override; void set_bandwidth(double value) override; void set_latency(double value) override; }; @@ -112,22 +116,9 @@ public: * Action * **********/ class L07Action : public CpuAction { - friend Action *CpuL07::execution_start(double size); - friend Action *CpuL07::sleep(double duration); - friend Action* HostL07Model::execute_parallel(size_t host_nb, s4u::Host* const* host_list, const double* flops_amount, - const double* bytes_amount, double rate); - friend Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate); - -public: - L07Action(kernel::resource::Model* model, size_t host_nb, s4u::Host* const* host_list, const double* flops_amount, - const double* bytes_amount, double rate); - L07Action(const L07Action&) = delete; - L07Action& operator=(const L07Action&) = delete; - ~L07Action(); - - void updateBound(); - std::vector hostList_; + bool free_arrays_ = false; // By default, computationAmount_ and friends are freed by caller. But not for sequential + // exec and regular comms const double* computationAmount_; /* pointer to the data that lives in s4u action -- do not free unless if * free_arrays */ const double* communicationAmount_; /* pointer to the data that lives in s4u action -- do not free unless if @@ -135,12 +126,28 @@ public: double latency_; double rate_; -private: - bool free_arrays_ = false; // By default, computationAmount_ and friends are freed by caller. But not for sequential - // exec and regular comms + friend CpuAction* CpuL07::execution_start(double size, double user_bound); + friend CpuAction* CpuL07::sleep(double duration); + friend CpuAction* HostL07Model::execute_parallel(const std::vector& host_list, const double* flops_amount, + const double* bytes_amount, double rate); + friend Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate); + +public: + L07Action() = delete; + L07Action(Model* model, const std::vector& host_list, const double* flops_amount, + const double* bytes_amount, double rate); + L07Action(const L07Action&) = delete; + L07Action& operator=(const L07Action&) = delete; + ~L07Action() override; + + void updateBound(); + double get_latency() const { return latency_; } + void set_latency(double latency) { latency_ = latency; } + void update_latency(double delta, double precision) { double_update(&latency_, delta, precision); } }; -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid #endif /* HOST_L07_HPP_ */