X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe304706848f0a64477d4687b3ea97d5b9a0c35c..cf6a1d5f1eddea2b377415ab57c5185058488269:/src/surf/ptask_L07.hpp diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp index 523e00f167..f153895210 100644 --- a/src/surf/ptask_L07.hpp +++ b/src/surf/ptask_L07.hpp @@ -1,12 +1,12 @@ -/* 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_ @@ -35,12 +35,11 @@ class XBT_PRIVATE L07Action; *********/ 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::CpuAction* execute_parallel(const std::vector& host_list, const double* flops_amount, const double* bytes_amount, double rate) override; @@ -48,40 +47,50 @@ public: class CpuL07Model : public kernel::resource::CpuModel { public: - CpuL07Model(HostL07Model* hmodel, kernel::lmm::System* sys); + CpuL07Model(const std::string& name, HostL07Model* hmodel, kernel::lmm::System* sys); CpuL07Model(const CpuL07Model&) = delete; CpuL07Model& operator=(const CpuL07Model&) = delete; - ~CpuL07Model(); - - kernel::resource::Cpu* create_cpu(s4u::Host* host, const 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 surf_presolve */ + }; + + kernel::resource::CpuImpl* create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) override; + HostL07Model* hostModel_; }; class NetworkL07Model : public kernel::resource::NetworkModel { public: - NetworkL07Model(HostL07Model* hmodel, kernel::lmm::System* sys); + NetworkL07Model(const std::string& name, HostL07Model* hmodel, kernel::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; + ~NetworkL07Model() override; + kernel::resource::LinkImpl* create_link(const std::string& name, const std::vector& bandwidths) final; + kernel::resource::LinkImpl* create_wifi_link(const std::string& name, const std::vector& bandwidths) override; kernel::resource::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 surf_presolve */ + }; - HostL07Model *hostModel_; + HostL07Model* hostModel_; }; /************ * Resource * ************/ -class CpuL07 : public kernel::resource::Cpu { +class CpuL07 : public kernel::resource::CpuImpl { public: - CpuL07(CpuL07Model* model, s4u::Host* host, const std::vector& speed_per_pstate, int core); + using kernel::resource::CpuImpl::CpuImpl; CpuL07(const CpuL07&) = delete; CpuL07& operator=(const CpuL07&) = delete; - ~CpuL07() override; - bool is_used() override; + + bool is_used() const override; void apply_event(kernel::profile::Event* event, double value) override; kernel::resource::CpuAction* execution_start(double size) override; kernel::resource::CpuAction* execution_start(double, int) override @@ -97,21 +106,30 @@ protected: class LinkL07 : public kernel::resource::LinkImpl { public: - LinkL07(NetworkL07Model* model, const std::string& name, double bandwidth, double latency, - s4u::Link::SharingPolicy policy); + LinkL07(const std::string& name, double bandwidth, kernel::lmm::System* system); LinkL07(const LinkL07&) = delete; LinkL07& operator=(const LinkL07&) = delete; ~LinkL07() override; - bool is_used() override; + bool is_used() const override; void apply_event(kernel::profile::Event* event, double value) override; void set_bandwidth(double value) override; - void set_latency(double value) override; + LinkImpl* set_latency(double value) override; }; /********** * Action * **********/ class L07Action : public kernel::resource::CpuAction { + 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 + * free_arrays */ + double latency_; + double rate_; + friend CpuAction* CpuL07::execution_start(double size); friend CpuAction* CpuL07::sleep(double duration); friend CpuAction* HostL07Model::execute_parallel(const std::vector& host_list, const double* flops_amount, @@ -119,25 +137,17 @@ class L07Action : public kernel::resource::CpuAction { friend Action* NetworkL07Model::communicate(s4u::Host* src, s4u::Host* dst, double size, double rate); public: + L07Action() = delete; L07Action(kernel::resource::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(); + ~L07Action() override; void updateBound(); - - std::vector hostList_; - 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 - * free_arrays */ - 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 + 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 surf