X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54f9d48567e65bd17b9ad3544b5aad57bef54463..41e07e98c29549b7f6a5702e548a0e4d0b0e31b2:/src/surf/ptask_L07.hpp diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp index c0b2dc3c82..568618a08d 100644 --- a/src/surf/ptask_L07.hpp +++ b/src/surf/ptask_L07.hpp @@ -42,18 +42,18 @@ public: double next_occuring_event(double now) override; void update_actions_state(double now, double delta) override; - kernel::resource::Action* execute_parallel(const std::vector host_list, const double* flops_amount, + kernel::resource::Action* execute_parallel(const std::vector& host_list, const double* flops_amount, const double* bytes_amount, double rate) override; }; -class CpuL07Model : public CpuModel { +class CpuL07Model : public kernel::resource::CpuModel { public: CpuL07Model(HostL07Model* hmodel, kernel::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; + kernel::resource::Cpu* create_cpu(s4u::Host* host, const std::vector& speed_per_pstate, int core) override; HostL07Model *hostModel_; }; @@ -75,9 +75,9 @@ public: * Resource * ************/ -class CpuL07 : public Cpu { +class CpuL07 : public kernel::resource::Cpu { public: - CpuL07(CpuL07Model* model, s4u::Host* host, std::vector* speed_per_pstate, int core); + CpuL07(CpuL07Model* model, s4u::Host* host, const std::vector& speed_per_pstate, int core); CpuL07(const CpuL07&) = delete; CpuL07& operator=(const CpuL07&) = delete; ~CpuL07() override; @@ -111,15 +111,15 @@ public: /********** * Action * **********/ -class L07Action : public CpuAction { +class L07Action : public kernel::resource::CpuAction { friend Action *CpuL07::execution_start(double size); friend Action *CpuL07::sleep(double duration); - friend Action* HostL07Model::execute_parallel(const std::vector host_list, const double* flops_amount, + friend Action* 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(kernel::resource::Model* model, const std::vector host_list, const double* flops_amount, + 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; @@ -140,7 +140,7 @@ private: // exec and regular comms }; -} -} +} // namespace surf +} // namespace simgrid #endif /* HOST_L07_HPP_ */