X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92b16058f7a0b9701132fe901195de01f9282c4d..fbf5fafb60eb44c0c00a7283fd05a6dec5f2b58f:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 83d176e4ad..2b3dff1f50 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -1,188 +1,160 @@ -/* Copyright (c) 2013-2014. 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 "cpu_interface.hpp" -#include "trace_mgr_private.h" -#include "surf/surf_routing.h" +#ifndef SURF_MODEL_CPUTI_H_ +#define SURF_MODEL_CPUTI_H_ -/* Epsilon */ -#define EPSILON 0.000000001 +#include "src/kernel/resource/profile/trace_mgr.hpp" +#include "src/surf/cpu_interface.hpp" + +#include + +namespace simgrid { +namespace surf { /*********** * Classes * ***********/ -class CpuTiTrace; -typedef CpuTiTrace *CpuTiTracePtr; - -class CpuTiTgmr; -typedef CpuTiTgmr *CpuTiTgmrPtr; - -class CpuTiModel; -typedef CpuTiModel *CpuTiModelPtr; - -class CpuTi; -typedef CpuTi *CpuTiPtr; - -class CpuTiAction; -typedef CpuTiAction *CpuTiActionPtr; - -typedef boost::intrusive::list CpuTiList; -typedef CpuTiList* CpuTiListPtr; -typedef boost::intrusive::list_base_hook<> cpuTiHook; - -struct tiTag; -typedef boost::intrusive::list > > > ActionTiList; -typedef ActionTiList* ActionTiListPtr; -typedef boost::intrusive::list_base_hook > actionTiHook; +class XBT_PRIVATE CpuTiModel; +class XBT_PRIVATE CpuTi; /********* * Trace * *********/ -class CpuTiTrace { +class CpuTiProfile { public: - CpuTiTrace(tmgr_trace_t powerTrace); - ~CpuTiTrace(); - - double integrateSimple(double a, double b); - double integrateSimplePoint(double a); - double solveSimple(double a, double amount); - - double *p_timePoints; - double *p_integral; - int m_nbPoints; - int binarySearch(double *array, double a, int low, int high); - -private: + explicit CpuTiProfile(kernel::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_; + int binary_search(double* array, double a, int low, int high); }; -enum trace_type { +class CpuTiTmgr { + enum class Type { + FIXED, /*< Trace fixed, no availability file */ + DYNAMIC /*< Dynamic, have an availability file */ + }; - TRACE_FIXED, /*< Trace fixed, no availability file */ - TRACE_DYNAMIC /*< Dynamic, availability file disponible */ -}; - -class CpuTiTgmr { public: - CpuTiTgmr(trace_type type, double value): m_type(type), m_value(value){}; - CpuTiTgmr(tmgr_trace_t power_trace, double value); - ~CpuTiTgmr(); + explicit CpuTiTmgr(double value) : type_(Type::FIXED), value_(value){}; + CpuTiTmgr(kernel::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 solveSomewhatSimple(double a, double amount); - double getPowerScale(double a); + double get_power_scale(double a); - trace_type m_type; - double m_value; /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */ +private: + Type type_; + double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */ /* Dynamic */ - double m_lastTime; /*< Integral interval last point (discret time) */ - double m_total; /*< Integral total between 0 and last_pointn */ + double last_time_ = 0.0; /*< Integral interval last point (discrete time) */ + double total_ = 0.0; /*< Integral total between 0 and last_pointn */ - CpuTiTracePtr p_trace; - tmgr_trace_t p_powerTrace; + CpuTiProfile* profile_ = nullptr; + kernel::profile::Profile* speed_profile_ = nullptr; }; -/********* - * Model * - *********/ -class CpuTiModel : public CpuModel { +/********** + * Action * + **********/ + +class XBT_PRIVATE CpuTiAction : public CpuAction { + friend class CpuTi; public: - CpuTiModel(); - ~CpuTiModel(); - CpuPtr createCpu(const char *name, xbt_dynar_t powerPeak, - int pstate, double power_scale, - tmgr_trace_t power_trace, int core, - e_surf_resource_state_t state_initial, - tmgr_trace_t state_trace, - xbt_dict_t cpu_properties); - double shareResources(double now); - void updateActionsState(double now, double delta); - void addTraces(); - - ActionListPtr p_runningActionSetThatDoesNotNeedBeingChecked; - CpuTiListPtr p_modifiedCpu; - xbt_heap_t p_tiActionHeap; - -protected: - void NotifyResourceTurnedOn(ResourcePtr){}; - void NotifyResourceTurnedOff(ResourcePtr){}; - - void NotifyActionCancel(ActionPtr){}; - void NotifyActionResume(ActionPtr){}; - void NotifyActionSuspend(ActionPtr){}; + CpuTiAction(CpuTi* cpu, double cost); + CpuTiAction(const CpuTiAction&) = delete; + CpuTiAction& operator=(const CpuTiAction&) = delete; + ~CpuTiAction(); + + void set_state(kernel::resource::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; + double get_remains() override; + + CpuTi *cpu_; + + boost::intrusive::list_member_hook<> action_ti_hook; }; +typedef boost::intrusive::member_hook, &CpuTiAction::action_ti_hook> ActionTiListOptions; +typedef boost::intrusive::list ActionTiList; + /************ * Resource * ************/ -class CpuTi : public cpuTiHook, public Cpu { +class CpuTi : public Cpu { public: - CpuTi() {}; - CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak, - int pstate, double powerScale, tmgr_trace_t powerTrace, int core, - e_surf_resource_state_t stateInitial, tmgr_trace_t stateTrace, - xbt_dict_t properties) ; - ~CpuTi(); - - void updateState(tmgr_trace_event_t event_type, double value, double date); - void updateActionsFinishTime(double now); - bool isUsed(); - void printCpuTiModel(); - CpuActionPtr execute(double size); - CpuActionPtr sleep(double duration); - double getAvailableSpeed(); - - double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;}; - double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;}; - int getNbPstates() {THROW_UNIMPLEMENTED;}; - void setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;}; - void modified(bool modified); - - CpuTiTgmrPtr p_availTrace; /*< Structure with data needed to integrate trace file */ - tmgr_trace_event_t p_stateEvent; /*< trace file with states events (ON or OFF) */ - tmgr_trace_event_t p_powerEvent; /*< trace file with availability events */ - ActionTiListPtr p_actionSet; /*< set with all actions running on cpu */ - double m_sumPriority; /*< the sum of actions' priority that are running on cpu */ - double m_lastUpdate; /*< last update of actions' remaining amount done */ - - double current_frequency; - - void updateRemainingAmount(double now); + CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core); + CpuTi(const CpuTi&) = delete; + CpuTi& operator&(const CpuTi&) = delete; + ~CpuTi() 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, int) override + { + THROW_UNIMPLEMENTED; + return nullptr; + } + CpuAction *sleep(double duration) override; + double get_speed_ratio() override; + + void set_modified(bool modified); + + 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 */ + + boost::intrusive::list_member_hook<> cpu_ti_hook; }; -/********** - * Action * - **********/ - -class CpuTiAction: public actionTiHook, public CpuAction { - friend CpuActionPtr CpuTi::execute(double size); - friend CpuActionPtr CpuTi::sleep(double duration); - friend void CpuTi::updateActionsFinishTime(double now);//FIXME - friend void CpuTi::updateRemainingAmount(double now);//FIXME +typedef boost::intrusive::member_hook, &CpuTi::cpu_ti_hook> CpuTiListOptions; +typedef boost::intrusive::list CpuTiList; +/********* + * Model * + *********/ +class CpuTiModel : public CpuModel { public: - CpuTiAction(CpuTiModelPtr model, double cost, bool failed, - CpuTiPtr cpu); - - void setState(e_surf_action_state_t state); - int unref(); - void cancel(); - void recycle(); - void updateIndexHeap(int i); - void suspend(); - void resume(); - bool isSuspended(); - void setMaxDuration(double duration); - void setPriority(double priority); - double getRemains(); - void setAffinity(CpuPtr /*cpu*/, unsigned long /*mask*/) {}; - - CpuTiPtr p_cpu; - int m_indexHeap; - int m_suspended; -private: + 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* 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_; }; + +} +} + +#endif /* SURF_MODEL_CPUTI_H_ */