X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/85e1d2c205ca99512b48bceca0f16677a401e233..16f06cbc4371b98049be5df2750bf34ece00ad14:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 982727d261..7ad6573b60 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -1,20 +1,20 @@ -/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-2019. 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 +#ifndef SURF_MODEL_CPUTI_H_ +#define SURF_MODEL_CPUTI_H_ +#include "src/kernel/resource/profile/Profile.hpp" #include "src/surf/cpu_interface.hpp" -#include "src/surf/trace_mgr.hpp" -/* Epsilon */ -#define EPSILON 0.000000001 +#include +#include namespace simgrid { -namespace surf { +namespace kernel { +namespace resource { /*********** * Classes * @@ -25,66 +25,65 @@ class XBT_PRIVATE CpuTi; /********* * Trace * *********/ -class CpuTiTrace { +class CpuTiProfile { public: - explicit CpuTiTrace(tmgr_trace_t speedTrace); - ~CpuTiTrace(); + explicit CpuTiProfile(profile::Profile* profile); 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); + std::vector time_points_; + std::vector integral_; + static int binary_search(const std::vector& array, double a); }; -enum trace_type { - - TRACE_FIXED, /*< Trace fixed, no availability file */ - TRACE_DYNAMIC /*< Dynamic, have an availability file */ -}; +class CpuTiTmgr { + enum class Type { + FIXED, /*< Trace fixed, no availability file */ + DYNAMIC /*< Dynamic, have an availability file */ + }; -class CpuTiTgmr { public: - CpuTiTgmr(trace_type type, double value) - : type_(type), value_(value) - {}; - CpuTiTgmr(tmgr_trace_t speedTrace, double value); - ~CpuTiTgmr(); + explicit CpuTiTmgr(double value) : type_(Type::FIXED), value_(value){}; + CpuTiTmgr(profile::Profile* speed_profile, double value); + CpuTiTmgr(const CpuTiTmgr&) = delete; + CpuTiTmgr& operator=(const CpuTiTmgr&) = delete; double integrate(double a, double b); double solve(double a, double amount); double get_power_scale(double a); - trace_type type_; +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 */ - CpuTiTrace *trace_ = nullptr; - tmgr_trace_t speed_trace_ = nullptr; + std::unique_ptr profile_ = nullptr; + profile::Profile* speed_profile_ = nullptr; }; /********** * Action * **********/ -class CpuTiAction: public CpuAction { +class XBT_PRIVATE CpuTiAction : public CpuAction { friend class CpuTi; public: - CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu); + CpuTiAction(CpuTi* cpu, double cost); + CpuTiAction(const CpuTiAction&) = delete; + CpuTiAction& operator=(const CpuTiAction&) = delete; ~CpuTiAction(); - void set_state(simgrid::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_; @@ -100,34 +99,34 @@ typedef boost::intrusive::list ActionTiList; ************/ class CpuTi : public Cpu { public: - CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core); + CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector& speed_per_pstate, int core); + CpuTi(const CpuTi&) = delete; + CpuTi& operator&(const CpuTi&) = delete; ~CpuTi() override; - void set_speed_trace(tmgr_trace_t trace) override; + void 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 requestedCores) override + CpuAction* execution_start(double size) override; + CpuAction* execution_start(double, int) override { THROW_UNIMPLEMENTED; return nullptr; } - CpuAction *sleep(double duration) override; - double get_available_speed() override; + CpuAction* sleep(double duration) override; + double get_speed_ratio() override; void set_modified(bool modified); - CpuTiTgmr* speed_integrated_trace_ = nullptr; /*< Structure with data needed to integrate trace file */ + CpuTiTmgr* speed_integrated_trace_ = nullptr; /*< Structure with data needed to integrate trace file */ ActionTiList action_set_; /*< set with all actions running on cpu */ double sum_priority_ = 0; /*< the sum of actions' priority that are running on cpu */ double last_update_ = 0; /*< last update of actions' remaining amount done */ - double current_frequency_; - boost::intrusive::list_member_hook<> cpu_ti_hook; }; @@ -139,15 +138,21 @@ typedef boost::intrusive::list CpuTiList; *********/ class CpuTiModel : public CpuModel { public: - CpuTiModel() = default; + 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* createCpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) override; + Cpu* create_cpu(s4u::Host* host, const std::vector& speed_per_pstate, int core) override; double next_occuring_event(double now) override; void update_actions_state(double now, double delta) override; - kernel::resource::Action::StateSet runningActionSetThatDoesNotNeedBeingChecked_; CpuTiList modified_cpus_; }; -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid + +#endif /* SURF_MODEL_CPUTI_H_ */