-/* Copyright (c) 2013-2019. 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. */
-#ifndef SURF_MODEL_CPUTI_H_
-#define SURF_MODEL_CPUTI_H_
-
-#include "src/kernel/resource/profile/trace_mgr.hpp"
-#include "src/surf/cpu_interface.hpp"
+#ifndef SURF_MODEL_CPUTI_HPP_
+#define SURF_MODEL_CPUTI_HPP_
+#include "src/kernel/resource/CpuImpl.hpp"
+#include "src/kernel/resource/profile/Profile.hpp"
#include <boost/intrusive/list.hpp>
+#include <memory>
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
/***********
* Classes *
***********/
class XBT_PRIVATE CpuTiModel;
class XBT_PRIVATE CpuTi;
+class XBT_PRIVATE CpuTiAction;
-/*********
- * Trace *
- *********/
+/***********
+ * Profile *
+ ***********/
class CpuTiProfile {
+ std::vector<double> time_points_;
+ std::vector<double> integral_;
+
public:
- explicit CpuTiProfile(profile::Profile* profile);
- CpuTiProfile(const CpuTiProfile&) = delete;
- CpuTiProfile& operator=(const CpuTiProfile&) = delete;
- ~CpuTiProfile();
-
- 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_;
- static int binary_search(double* array, double a, int size);
+ explicit CpuTiProfile(const profile::Profile* profile);
+
+ const std::vector<double>& get_time_points() const { return time_points_; }
+
+ double integrate_simple(double a, double b) const;
+ double integrate_simple_point(double a) const;
+ double solve_simple(double a, double amount) const;
+
+ static long binary_search(const std::vector<double>& array, double a);
};
class CpuTiTmgr {
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 */
+
+ /* Dynamic */
+ double last_time_ = 0.0; /*< Integral interval last point (discrete time) */
+ double total_ = 0.0; /*< Integral total between 0 and last point */
+
+ std::unique_ptr<CpuTiProfile> profile_ = nullptr;
+ profile::Profile* speed_profile_ = nullptr;
public:
- explicit CpuTiTmgr(double value) : type_(Type::FIXED), value_(value){};
+ explicit CpuTiTmgr(double value) : value_(value){};
CpuTiTmgr(profile::Profile* speed_profile, double value);
CpuTiTmgr(const CpuTiTmgr&) = delete;
CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
- ~CpuTiTmgr();
-
- double integrate(double a, double b);
- double solve(double a, double amount);
- double get_power_scale(double a);
-
-private:
- Type type_;
- double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
-
- /* Dynamic */
- double last_time_ = 0.0; /*< Integral interval last point (discrete time) */
- double total_ = 0.0; /*< Integral total between 0 and last_pointn */
- CpuTiProfile* profile_ = nullptr;
- profile::Profile* speed_profile_ = nullptr;
+ double integrate(double a, double b) const;
+ double solve(double a, double amount) const;
+ double get_power_scale(double a) const;
};
/**********
CpuTiAction(CpuTi* cpu, double cost);
CpuTiAction(const CpuTiAction&) = delete;
CpuTiAction& operator=(const CpuTiAction&) = delete;
- ~CpuTiAction();
+ ~CpuTiAction() 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_;
boost::intrusive::list_member_hook<> action_ti_hook;
};
-typedef boost::intrusive::member_hook<CpuTiAction, boost::intrusive::list_member_hook<>, &CpuTiAction::action_ti_hook> ActionTiListOptions;
-typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
+using ActionTiListOptions =
+ boost::intrusive::member_hook<CpuTiAction, boost::intrusive::list_member_hook<>, &CpuTiAction::action_ti_hook>;
+using ActionTiList = boost::intrusive::list<CpuTiAction, ActionTiListOptions>;
/************
* Resource *
************/
-class CpuTi : public Cpu {
+class CpuTi : public CpuImpl {
public:
- CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core);
+ CpuTi(s4u::Host* host, const std::vector<double>& speed_per_pstate);
CpuTi(const CpuTi&) = delete;
CpuTi& operator&(const CpuTi&) = delete;
~CpuTi() override;
- void set_speed_profile(profile::Profile* profile) override;
+ CpuImpl* set_speed_profile(profile::Profile* profile) 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;
- Action* execution_start(double, int) 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;
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
-typedef boost::intrusive::member_hook<CpuTi, boost::intrusive::list_member_hook<>, &CpuTi::cpu_ti_hook> CpuTiListOptions;
-typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
+using CpuTiListOptions =
+ boost::intrusive::member_hook<CpuTi, boost::intrusive::list_member_hook<>, &CpuTi::cpu_ti_hook>;
+using CpuTiList = boost::intrusive::list<CpuTi, CpuTiListOptions>;
/*********
* Model *
*********/
class CpuTiModel : public CpuModel {
public:
- static void create_pm_vm_models(); // Make both models be TI models
+ static void create_pm_models(); // Make CPU PM model
- CpuTiModel();
+ using CpuModel::CpuModel;
CpuTiModel(const CpuTiModel&) = delete;
CpuTiModel& operator=(const CpuTiModel&) = delete;
- ~CpuTiModel() override;
- Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
- double next_occuring_event(double now) override;
+ CpuImpl* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
+ double next_occurring_event(double now) override;
void update_actions_state(double now, double delta) override;
CpuTiList modified_cpus_;
};
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
-#endif /* SURF_MODEL_CPUTI_H_ */
+#endif /* SURF_MODEL_CPUTI_HPP_ */
