X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f2df13795e01302813a6aef10825ec7e922ce530..5f9b13c6302e914a514168da8ff54818c0ee6787:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index b44ff9713b..1f8bb91298 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -1,40 +1,38 @@ -/* 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 * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "cpu_interface.hpp" -#include "trace_mgr_private.h" +#include + +#include "src/surf/cpu_interface.hpp" +#include "src/surf/trace_mgr.hpp" #include "surf/surf_routing.h" /* Epsilon */ #define EPSILON 0.000000001 +namespace simgrid { +namespace surf { + /*********** * Classes * ***********/ -class CpuTiTrace; -typedef CpuTiTrace *CpuTiTracePtr; - -class CpuTiTgmr; -typedef CpuTiTgmr *CpuTiTgmrPtr; - -class CpuTiModel; -typedef CpuTiModel *CpuTiModelPtr; +class XBT_PRIVATE CpuTiTrace; +class XBT_PRIVATE CpuTiTgmr; +class XBT_PRIVATE CpuTiModel; +class XBT_PRIVATE CpuTi; +class XBT_PRIVATE CpuTiAction; -class CpuTi; -typedef CpuTi *CpuTiPtr; - -class CpuTiAction; -typedef CpuTiAction *CpuTiActionPtr; +struct tiTag; /********* * Trace * *********/ class CpuTiTrace { public: - CpuTiTrace(tmgr_trace_t powerTrace); + CpuTiTrace(tmgr_trace_t speedTrace); ~CpuTiTrace(); double integrateSimple(double a, double b); @@ -45,20 +43,20 @@ public: double *p_integral; int m_nbPoints; int binarySearch(double *array, double a, int low, int high); - -private: }; enum trace_type { - + TRACE_FIXED, /*< Trace fixed, no availability file */ - TRACE_DYNAMIC /*< Dynamic, availability file disponible */ + TRACE_DYNAMIC /*< Dynamic, have an availability file */ }; class CpuTiTgmr { public: - CpuTiTgmr(trace_type type, double value): m_type(type), m_value(value){}; - CpuTiTgmr(tmgr_trace_t power_trace, double value); + CpuTiTgmr(trace_type type, double value) + : m_type(type), m_value(value) + {}; + CpuTiTgmr(tmgr_trace_t speedTrace, double value); ~CpuTiTgmr(); double integrate(double a, double b); @@ -67,118 +65,113 @@ public: double getPowerScale(double a); trace_type m_type; - double m_value; /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */ + double m_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 m_lastTime = 0.0; /*< Integral interval last point (discrete time) */ + double m_total = 0.0; /*< Integral total between 0 and last_pointn */ - CpuTiTracePtr p_trace; - tmgr_trace_t p_powerTrace; + CpuTiTrace *p_trace = nullptr; + tmgr_trace_t p_speedTrace = nullptr; }; -/********* - * Model * - *********/ -class CpuTiModel : public CpuModel { -public: - CpuTiModel(); - ~CpuTiModel(); - - 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); - double shareResources(double now); - void updateActionsState(double now, double delta); - void addTraces(); - - ActionListPtr p_runningActionSetThatDoesNotNeedBeingChecked; - xbt_swag_t p_modifiedCpu; - xbt_heap_t p_tiActionHeap; +/********** + * Action * + **********/ -protected: - void NotifyResourceTurnedOn(ResourcePtr){}; - void NotifyResourceTurnedOff(ResourcePtr){}; +class CpuTiAction: public CpuAction { + friend class CpuTi; +public: + CpuTiAction(CpuTiModel *model, double cost, bool failed, + CpuTi *cpu); - void NotifyActionCancel(ActionPtr){}; - void NotifyActionResume(ActionPtr){}; - void NotifyActionSuspend(ActionPtr){}; + void setState(e_surf_action_state_t state) override; + int unref() override; + void cancel() override; + void updateIndexHeap(int i); + void suspend() override; + void resume() override; + void setMaxDuration(double duration) override; + void setPriority(double priority) override; + double getRemains() override; + void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {}; + + CpuTi *p_cpu; + int m_indexHeap; + int m_suspended = 0; +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, - 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(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak, + int pstate, double speedScale, tmgr_trace_t speedTrace, int core, + int initiallyOn, tmgr_trace_t stateTrace) ; ~CpuTi(); - void updateState(tmgr_trace_event_t event_type, double value, double date); + void set_speed_trace(tmgr_trace_t trace) override; + + void apply_event(tmgr_trace_iterator_t event, double value) override; 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;}; - - 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 */ + void updateRemainingAmount(double now); + + bool isUsed() override; + CpuAction *execution_start(double size) override; + CpuAction *sleep(double duration) override; + double getAvailableSpeed() override; + + void modified(bool modified); + + CpuTiTgmr *p_availTrace; /*< Structure with data needed to integrate trace file */ + 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 m_lastUpdate = 0; /*< 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() {}; - 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; - s_xbt_swag_hookup_t p_cpuListHookup; - int m_suspended; -private: + CpuTiModel(); + ~CpuTiModel(); + Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, + int pstate, double speedScale, + tmgr_trace_t speedTrace, int core, + int initiallyOn, tmgr_trace_t state_trace) override; + double next_occuring_event(double now) override; + void updateActionsState(double now, double delta) override; + + ActionList *p_runningActionSetThatDoesNotNeedBeingChecked; + CpuTiList *p_modifiedCpu; + xbt_heap_t p_tiActionHeap; + +protected: + void NotifyResourceTurnedOn(simgrid::surf::Resource*){}; + void NotifyResourceTurnedOff(simgrid::surf::Resource*){}; + + void NotifyActionCancel(Action*){}; + void NotifyActionResume(Action*){}; + void NotifyActionSuspend(Action*){}; }; + +} +}