#ifndef SURF_MODEL_CPUTI_H_
#define SURF_MODEL_CPUTI_H_
+#include "src/kernel/resource/profile/trace_mgr.hpp"
#include "src/surf/cpu_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
#include <boost/intrusive/list.hpp>
* Action *
**********/
-class XBT_PRIVATE CpuTiAction : public CpuAction {
+class XBT_PRIVATE CpuTiAction : public kernel::resource::CpuAction {
friend class CpuTi;
public:
CpuTiAction(CpuTi* cpu, double cost);
+ CpuTiAction(const CpuTiAction&) = delete;
+ CpuTiAction& operator=(const CpuTiAction&) = delete;
~CpuTiAction();
void set_state(kernel::resource::Action::State state) override;
/************
* Resource *
************/
-class CpuTi : public Cpu {
+class CpuTi : public kernel::resource::Cpu {
public:
- CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core);
+ CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core);
+ CpuTi(const CpuTi&) = delete;
+ CpuTi& operator&(const CpuTi&) = delete;
~CpuTi() override;
- void set_speed_trace(kernel::profile::Profile* profile) override;
+ void set_speed_profile(kernel::profile::Profile* profile) override;
void apply_event(kernel::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;
- kernel::resource::Action* execution_start(double size, int requested_cores) override
+ kernel::resource::CpuAction* execution_start(double size) override;
+ kernel::resource::Action* execution_start(double, int) override
{
THROW_UNIMPLEMENTED;
return nullptr;
}
- CpuAction *sleep(double duration) override;
+ kernel::resource::CpuAction* sleep(double duration) override;
double get_speed_ratio() override;
void set_modified(bool modified);
/*********
* Model *
*********/
-class CpuTiModel : public CpuModel {
+class CpuTiModel : public kernel::resource::CpuModel {
public:
static void create_pm_vm_models(); // Make both models be TI models
CpuTiModel();
+ CpuTiModel(const CpuTiModel&) = delete;
+ CpuTiModel& operator=(const CpuTiModel&) = delete;
~CpuTiModel() override;
- Cpu* create_cpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
+ kernel::resource::Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
double next_occuring_event(double now) override;
void update_actions_state(double now, double delta) override;
CpuTiList modified_cpus_;
};
-}
-}
+} // namespace surf
+} // namespace simgrid
#endif /* SURF_MODEL_CPUTI_H_ */