X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f23b0fb864cb60978c1fcfd48d50f62dd054fe31..72d32c4e88a57f4786f62fec48a1bfa454adbff9:/src/surf/cpu_ti.hpp?ds=sidebyside diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 519e744220..c1c72bb82d 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -1,74 +1,68 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-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 - -#include - -#include "src/surf/cpu_interface.hpp" -#include "src/surf/trace_mgr.hpp" +#ifndef SURF_MODEL_CPUTI_HPP_ +#define SURF_MODEL_CPUTI_HPP_ -/* Epsilon */ -#define EPSILON 0.000000001 +#include "src/kernel/resource/CpuImpl.hpp" +#include "src/kernel/resource/profile/Profile.hpp" +#include +#include -namespace simgrid { -namespace surf { +namespace simgrid::kernel::resource { /*********** * Classes * ***********/ class XBT_PRIVATE CpuTiModel; class XBT_PRIVATE CpuTi; +class XBT_PRIVATE CpuTiAction; + +/*********** + * Profile * + ***********/ +class CpuTiProfile { + std::vector time_points_; + std::vector integral_; -/********* - * Trace * - *********/ -class CpuTiTrace { public: - explicit CpuTiTrace(tmgr_trace_t speedTrace); - CpuTiTrace(const CpuTiTrace&) = delete; - CpuTiTrace& operator=(const CpuTiTrace&) = delete; - ~CpuTiTrace(); - - double integrate_simple(double a, double b); - double integrate_simple_point(double a); - double solve_simple(double a, double amount); - - double* time_points_; - double *integral_; - int nb_points_; - int binary_search(double* array, double a, int low, int high); -}; + explicit CpuTiProfile(const profile::Profile* profile); + + const std::vector& get_time_points() const { return time_points_; } -enum trace_type { + double integrate_simple(double a, double b) const; + double integrate_simple_point(double a) const; + double solve_simple(double a, double amount) const; - TRACE_FIXED, /*< Trace fixed, no availability file */ - TRACE_DYNAMIC /*< Dynamic, have an availability file */ + static long binary_search(const std::vector& array, double a); }; class CpuTiTmgr { -public: - CpuTiTmgr(trace_type type, double value) : type_(type), value_(value){}; - CpuTiTmgr(tmgr_trace_t speed_trace, double value); - CpuTiTmgr(const CpuTiTmgr&) = delete; - CpuTiTmgr& operator=(const CpuTiTmgr&) = delete; - ~CpuTiTmgr(); + enum class Type { + FIXED, /*< Trace fixed, no availability file */ + DYNAMIC /*< Dynamic, have an availability file */ + }; + Type type_ = Type::FIXED; + double value_ = 0.0; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */ - double integrate(double a, double b); - double solve(double a, double amount); - double get_power_scale(double a); + /* Dynamic */ + double last_time_ = 0.0; /*< Integral interval last point (discrete time) */ + double total_ = 0.0; /*< Integral total between 0 and last point */ - trace_type type_; - double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */ + std::unique_ptr profile_ = nullptr; + profile::Profile* speed_profile_ = nullptr; - /* Dynamic */ - double last_time_ = 0.0; /*< Integral interval last point (discrete time) */ - double total_ = 0.0; /*< Integral total between 0 and last_pointn */ +public: + explicit CpuTiTmgr(double value) : value_(value){}; + CpuTiTmgr(profile::Profile* speed_profile, double value); + CpuTiTmgr(const CpuTiTmgr&) = delete; + CpuTiTmgr& operator=(const CpuTiTmgr&) = delete; - CpuTiTrace *trace_ = nullptr; - tmgr_trace_t speed_trace_ = nullptr; + double integrate(double a, double b) const; + double solve(double a, double amount) const; + double get_power_scale(double a) const; }; /********** @@ -79,14 +73,15 @@ class XBT_PRIVATE CpuTiAction : public CpuAction { friend class CpuTi; public: CpuTiAction(CpuTi* cpu, double cost); - ~CpuTiAction(); + CpuTiAction(const CpuTiAction&) = delete; + CpuTiAction& operator=(const CpuTiAction&) = delete; + ~CpuTiAction() override; - void set_state(kernel::resource::Action::State state) override; + void set_state(Action::State state) override; void cancel() override; void suspend() override; void resume() override; - void set_max_duration(double duration) override; - void set_priority(double priority) override; + void set_sharing_penalty(double sharing_penalty) override; double get_remains() override; CpuTi *cpu_; @@ -94,31 +89,34 @@ public: boost::intrusive::list_member_hook<> action_ti_hook; }; -typedef boost::intrusive::member_hook, &CpuTiAction::action_ti_hook> ActionTiListOptions; -typedef boost::intrusive::list ActionTiList; +using ActionTiListOptions = + boost::intrusive::member_hook, &CpuTiAction::action_ti_hook>; +using ActionTiList = boost::intrusive::list; /************ * Resource * ************/ -class CpuTi : public Cpu { +class CpuTi : public CpuImpl { public: - CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core); + CpuTi(s4u::Host* host, const std::vector& speed_per_pstate); + CpuTi(const CpuTi&) = delete; + CpuTi& operator&(const CpuTi&) = delete; ~CpuTi() override; - void set_speed_trace(tmgr_trace_t trace) override; + CpuImpl* set_speed_profile(profile::Profile* profile) override; - void apply_event(tmgr_trace_event_t event, double value) override; + void apply_event(profile::Event* event, double value) override; void update_actions_finish_time(double now); void update_remaining_amount(double now); - bool is_used() override; - CpuAction *execution_start(double size) override; - simgrid::kernel::resource::Action* execution_start(double size, int requested_cores) override + bool is_used() const override; + CpuAction* execution_start(double size, double user_bound) override; + CpuAction* execution_start(double, int, double) override { THROW_UNIMPLEMENTED; return nullptr; } - CpuAction *sleep(double duration) override; + CpuAction* sleep(double duration) override; double get_speed_ratio() override; void set_modified(bool modified); @@ -131,22 +129,27 @@ public: boost::intrusive::list_member_hook<> cpu_ti_hook; }; -typedef boost::intrusive::member_hook, &CpuTi::cpu_ti_hook> CpuTiListOptions; -typedef boost::intrusive::list CpuTiList; +using CpuTiListOptions = + boost::intrusive::member_hook, &CpuTi::cpu_ti_hook>; +using CpuTiList = boost::intrusive::list; /********* * Model * *********/ class CpuTiModel : public CpuModel { public: - CpuTiModel() : CpuModel(Model::UpdateAlgo::FULL){}; - ~CpuTiModel() override; - Cpu* create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) override; - double next_occuring_event(double now) override; + static void create_pm_models(); // Make CPU PM model + + using CpuModel::CpuModel; + CpuTiModel(const CpuTiModel&) = delete; + CpuTiModel& operator=(const CpuTiModel&) = delete; + CpuImpl* create_cpu(s4u::Host* host, const std::vector& speed_per_pstate) override; + double next_occurring_event(double now) override; void update_actions_state(double now, double delta) override; CpuTiList modified_cpus_; }; -} -} +} // namespace simgrid::kernel::resource + +#endif /* SURF_MODEL_CPUTI_HPP_ */