X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51f8d73fe7373b7b04bc2727ff9ef61272dce9a9..3715b2a421abd8357f41fb2be3c25a351f1af8cb:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index ccf8defe5a..de57ece312 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -1,4 +1,10 @@ -#include "cpu.hpp" +/* Copyright (c) 2013-2014. 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" @@ -8,42 +14,66 @@ /*********** * Classes * ***********/ +class CpuTiTrace; +class CpuTiTgmr; class CpuTiModel; -typedef CpuTiModel *CpuTiModelPtr; - class CpuTi; -typedef CpuTi *CpuTiPtr; - class CpuTiAction; -typedef CpuTiAction *CpuTiActionPtr; + +typedef boost::intrusive::list CpuTiList; +typedef boost::intrusive::list_base_hook<> cpuTiHook; + +struct tiTag; +typedef boost::intrusive::list > > > ActionTiList; +typedef boost::intrusive::list_base_hook > actionTiHook; /********* * 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); + +private: +}; + +enum trace_type { -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(); - /* Dynamic */ - double last_time; /*< Integral interval last point (discret time) */ - double total; /*< Integral total between 0 and last_pointn */ + double integrate(double a, double b); + double solve(double a, double amount); + double solveSomewhatSimple(double a, double amount); + double getPowerScale(double a); - surf_cpu_ti_trace_t trace; - tmgr_trace_t power_trace; + trace_type m_type; + double m_value; /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */ -} s_surf_cpu_ti_tgmr_t, *surf_cpu_ti_tgmr_t; + /* Dynamic */ + double m_lastTime; /*< Integral interval last point (discret time) */ + double m_total; /*< Integral total between 0 and last_pointn */ + CpuTiTrace *p_trace; + tmgr_trace_t p_powerTrace; +}; /********* * Model * @@ -51,60 +81,97 @@ typedef struct surf_cpu_ti_tgmr { class CpuTiModel : public CpuModel { public: CpuTiModel(); - ~CpuTiModel() {} - - CpuTiPtr createResource(string name, double power_peak, double power_scale, + ~CpuTiModel(); + Cpu *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); - CpuTiActionPtr createAction(double cost, bool failed); + double shareResources(double now); + void updateActionsState(double now, double delta); + void addTraces(); + + ActionList *p_runningActionSetThatDoesNotNeedBeingChecked; + CpuTiList *p_modifiedCpu; + xbt_heap_t p_tiActionHeap; protected: - void NotifyResourceTurnedOn(ResourcePtr r){}; - void NotifyResourceTurnedOff(ResourcePtr r){}; + void NotifyResourceTurnedOn(Resource*){}; + void NotifyResourceTurnedOff(Resource*){}; - void NotifyActionCancel(ActionPtr a){}; - void NotifyActionResume(ActionPtr a){}; - void NotifyActionSuspend(ActionPtr a){}; + void NotifyActionCancel(Action*){}; + void NotifyActionResume(Action*){}; + void NotifyActionSuspend(Action*){}; }; /************ * Resource * ************/ -class CpuTi : public Cpu { +class CpuTi : public cpuTiHook, public Cpu { public: - CpuTi(CpuTiModelPtr model, string name, double powerPeak, - double powerScale, tmgr_trace_t powerTrace, int core, + CpuTi() {}; + CpuTi(CpuTiModel *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 (); + ~CpuTi(); + + void updateState(tmgr_trace_event_t event_type, double value, double date); + void updateActionsFinishTime(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 */ + CpuAction *execute(double size); + CpuAction *sleep(double duration); + double getAvailableSpeed(); + + double getCurrentPowerPeak() {THROW_UNIMPLEMENTED;}; + double getPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;}; + int getNbPstates() {THROW_UNIMPLEMENTED;}; + void setPstate(int /*pstate_index*/) {THROW_UNIMPLEMENTED;}; + int getPstate() { THROW_UNIMPLEMENTED;} + void modified(bool modified); + + CpuTiTgmr *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 */ + ActionTiList *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); }; /********** * 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(); +class CpuTiAction: public actionTiHook, public CpuAction { + friend CpuAction *CpuTi::execute(double size); + friend CpuAction *CpuTi::sleep(double duration); + friend void CpuTi::updateActionsFinishTime(double now);//FIXME + friend void CpuTi::updateRemainingAmount(double now);//FIXME + +public: + CpuTiAction(CpuTiModel *model, double cost, bool failed, + CpuTi *cpu); + + void setState(e_surf_action_state_t state); + int unref(); + void cancel(); + void updateIndexHeap(int i); + void suspend(); + void resume(); + bool isSuspended(); + void setMaxDuration(double duration); + void setPriority(double priority); + double getRemains(); + void setAffinity(Cpu */*cpu*/, unsigned long /*mask*/) {}; + + CpuTi *p_cpu; + int m_indexHeap; + int m_suspended; +private: };