X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3ae712a1b95294052b6e8136d0f0f2d4b30e6eb..c3f81b26d8e8d696a2cc706d18388d8d681cc26c:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 1361b0ef4b..e08d5ca663 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2014. The SimGrid Team. +/* Copyright (c) 2013-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -15,19 +15,12 @@ * 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; + +struct tiTag; /********* * Trace * @@ -73,49 +66,55 @@ public: double m_lastTime; /*< Integral interval last point (discret time) */ double m_total; /*< Integral total between 0 and last_pointn */ - CpuTiTracePtr p_trace; + CpuTiTrace *p_trace; tmgr_trace_t p_powerTrace; }; -/********* - * Model * - *********/ -class CpuTiModel : public CpuModel { -public: - CpuTiModel(); - ~CpuTiModel(); - - void parseInit(sg_platf_host_cbarg_t host); - CpuPtr 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); - double shareResources(double now); - void updateActionsState(double now, double delta); - void addTraces(); +/********** + * Action * + **********/ - ActionListPtr p_runningActionSetThatDoesNotNeedBeingChecked; - xbt_swag_t p_modifiedCpu; - xbt_heap_t p_tiActionHeap; +class CpuTiAction: public CpuAction { + friend class CpuTi; + // 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); -protected: - void NotifyResourceTurnedOn(ResourcePtr){}; - void NotifyResourceTurnedOff(ResourcePtr){}; + 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*/) {}; - void NotifyActionCancel(ActionPtr){}; - void NotifyActionResume(ActionPtr){}; - void NotifyActionSuspend(ActionPtr){}; + CpuTi *p_cpu; + int m_indexHeap; + int m_suspended; +public: + boost::intrusive::list_member_hook<> action_ti_hook; }; +typedef boost::intrusive::member_hook< + CpuTiAction, boost::intrusive::list_member_hook<>, &CpuTiAction::action_ti_hook> ActionTiListOptions; +typedef boost::intrusive::list< + CpuTiAction, ActionTiListOptions > ActionTiList; + /************ * Resource * ************/ class CpuTi : public Cpu { public: CpuTi() {}; - CpuTi(CpuTiModelPtr model, const char *name, xbt_dynar_t powerPeak, + 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) ; @@ -125,59 +124,61 @@ public: void updateActionsFinishTime(double now); bool isUsed(); void printCpuTiModel(); - CpuActionPtr execute(double size); - CpuActionPtr sleep(double duration); + 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 setPowerPeakAt(int /*pstate_index*/) {THROW_UNIMPLEMENTED;}; + void setPstate(int /*pstate_index*/) {THROW_UNIMPLEMENTED;}; + int getPstate() { THROW_UNIMPLEMENTED;} + void modified(bool modified); - CpuTiTgmrPtr p_availTrace; /*< Structure with data needed to integrate trace file */ + 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 */ - 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 */ + 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 */ - int m_pstate; /*< Current pstate (index in the power_peak_list)*/ double current_frequency; void updateRemainingAmount(double now); +public: + boost::intrusive::list_member_hook<> cpu_ti_hook; }; -/********** - * Action * - **********/ - -class CpuTiAction: 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, boost::intrusive::list_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); + CpuTiModel(); + ~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); + double shareResources(double now); + void updateActionsState(double now, double delta); + void addTraces(); - 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*/) {}; + ActionList *p_runningActionSetThatDoesNotNeedBeingChecked; + CpuTiList *p_modifiedCpu; + xbt_heap_t p_tiActionHeap; - CpuTiPtr p_cpu; - int m_indexHeap; - s_xbt_swag_hookup_t p_cpuListHookup; - int m_suspended; -private: +protected: + void NotifyResourceTurnedOn(Resource*){}; + void NotifyResourceTurnedOff(Resource*){}; + + void NotifyActionCancel(Action*){}; + void NotifyActionResume(Action*){}; + void NotifyActionSuspend(Action*){}; };