X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51f8d73fe7373b7b04bc2727ff9ef61272dce9a9..91bb8b44ef09735fc79f40a3d9eeb69456a46909:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index ccf8defe5a..cde7ab9c87 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -8,6 +8,12 @@ /*********** * Classes * ***********/ +class CpuTiTrace; +typedef CpuTiTrace *CpuTiTracePtr; + +class CpuTiTgmr; +typedef CpuTiTgmr *CpuTiTgmrPtr; + class CpuTiModel; typedef CpuTiModel *CpuTiModelPtr; @@ -20,29 +26,50 @@ typedef CpuTiAction *CpuTiActionPtr; /********* * Trace * *********/ -typedef struct surf_cpu_ti_trace { - double *time_points; - double *integral; - int nb_points; -} s_surf_cpu_ti_trace_t, *surf_cpu_ti_trace_t; +class CpuTiTrace { +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); -enum trace_type { +private: +}; + +enum trace_type { + TRACE_FIXED, /*< Trace fixed, no availability file */ TRACE_DYNAMIC /*< Dynamic, availability file disponible */ }; -typedef struct surf_cpu_ti_tgmr { - trace_type type; - double value; /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */ +class CpuTiTgmr { +public: + CpuTiTgmr(trace_type type, double value): m_type(type), m_value(value){}; + CpuTiTgmr(tmgr_trace_t power_trace, double value); + ~CpuTiTgmr(); + + double integrate(double a, double b); + double solve(double a, double amount); + double solveSomewhatSimple(double a, double amount); + double getPowerScale(double a); - /* Dynamic */ - double last_time; /*< Integral interval last point (discret time) */ - double total; /*< Integral total between 0 and last_pointn */ + trace_type m_type; + double m_value; /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */ - surf_cpu_ti_trace_t trace; - tmgr_trace_t power_trace; + /* Dynamic */ + double m_lastTime; /*< Integral interval last point (discret time) */ + double m_total; /*< Integral total between 0 and last_pointn */ -} s_surf_cpu_ti_tgmr_t, *surf_cpu_ti_tgmr_t; + CpuTiTracePtr p_trace; + tmgr_trace_t p_powerTrace; +}; /********* @@ -51,14 +78,19 @@ typedef struct surf_cpu_ti_tgmr { class CpuTiModel : public CpuModel { public: CpuTiModel(); - ~CpuTiModel() {} + ~CpuTiModel(); - CpuTiPtr createResource(string name, double power_peak, double power_scale, + void parseInit(sg_platf_host_cbarg_t host); + CpuTiPtr createResource(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); CpuTiActionPtr createAction(double cost, bool failed); + double shareResources(double now); + void updateActionsState(double now, double delta); + void addTraces(); protected: void NotifyResourceTurnedOn(ResourcePtr r){}; @@ -74,37 +106,73 @@ protected: ************/ class CpuTi : public Cpu { public: - CpuTi(CpuTiModelPtr model, string name, double powerPeak, - double powerScale, tmgr_trace_t powerTrace, int core, + 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() {}; - virtual double getSpeed (double load); - virtual double getAvailableSpeed (); + + void updateState(tmgr_trace_event_t event_type, double value, double date); + void updateActionFinishDate(double now); + bool isUsed(); void printCpuTiModel(); - CpuTiModelPtr getModel(); - - double m_powerPeak; /*< CPU power peak */ - double m_powerScale; /*< Percentage of CPU disponible */ - surf_cpu_ti_tgmr_t m_availTrace; /*< Structure with data needed to integrate trace file */ - e_surf_resource_state_t m_stateCurrent; /*< CPU current state (ON or OFF) */ - tmgr_trace_event_t m_stateEvent; /*< trace file with states events (ON or OFF) */ - tmgr_trace_event_t m_powerEvent; /*< trace file with availabitly events */ - std::vector m_actionSet; /*< set with all actions running on cpu */ - s_xbt_swag_hookup_t m_modifiedCpuHookup; /*< hookup to swag that indicacates whether share resources must be recalculated or not */ + CpuActionPtr execute(double size); + CpuTiActionPtr _execute(double size); + CpuActionPtr sleep(double duration); + double getAvailableSpeed(); + + xbt_dynar_t getWattsRangeList() {THROW_UNIMPLEMENTED;}; + double getCurrentWattsValue(double cpu_load) {THROW_UNIMPLEMENTED;}; + void updateEnergy(double cpu_load) {THROW_UNIMPLEMENTED;}; + + double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;}; + double getPowerPeakAt(int pstate_index) {THROW_UNIMPLEMENTED;}; + int getNbPstates() {THROW_UNIMPLEMENTED;}; + void setPowerPeakAt(int pstate_index) {THROW_UNIMPLEMENTED;}; + double getConsumedEnergy() {THROW_UNIMPLEMENTED;}; + + 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 */ + xbt_swag_t p_actionSet; /*< set with all actions running on cpu */ + s_xbt_swag_hookup_t p_modifiedCpuHookup; /*< hookup to swag that indicates whether share resources must be recalculated or not */ double m_sumPriority; /*< the sum of actions' priority that are running on cpu */ double m_lastUpdate; /*< last update of actions' remaining amount done */ + int m_pstate; /*< Current pstate (index in the power_peak_list)*/ + double current_frequency; + + void updateRemainingAmount(double now); }; /********** * Action * **********/ + class CpuTiAction: public CpuAction { public: - CpuTiAction(CpuTiModelPtr model, double cost, bool failed): CpuAction(model, cost, failed) {}; - - virtual double getRemains(); - virtual double getStartTime(); - virtual double getFinishTime(); + CpuTiAction() {}; + CpuTiAction(CpuTiModelPtr model, double cost, bool failed) + : Action(model, cost, failed), CpuAction(model, cost, failed) { + p_cpuListHookup.next = 0; + p_cpuListHookup.prev = 0; + }; + + 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(); + CpuTiPtr p_cpu; + int m_indexHeap; + s_xbt_swag_hookup_t p_cpuListHookup; + int m_suspended; +private: };