X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/51f8d73fe7373b7b04bc2727ff9ef61272dce9a9..02dd785d0212ccd8376c2ce4fd931942232fcafb:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index ccf8defe5a..4f70915a7f 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -1,110 +1,170 @@ -#include "cpu.hpp" -#include "trace_mgr_private.h" +/* 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 + +#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 CpuTiModel; -typedef CpuTiModel *CpuTiModelPtr; - -class CpuTi; -typedef CpuTi *CpuTiPtr; +class XBT_PRIVATE CpuTiTrace; +class XBT_PRIVATE CpuTiTgmr; +class XBT_PRIVATE CpuTiModel; +class XBT_PRIVATE CpuTi; +class XBT_PRIVATE CpuTiAction; -class CpuTiAction; -typedef CpuTiAction *CpuTiActionPtr; +struct tiTag; /********* * 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: + explicit CpuTiTrace(tmgr_trace_t speedTrace); + ~CpuTiTrace(); -enum trace_type { - TRACE_FIXED, /*< Trace fixed, no availability file */ - TRACE_DYNAMIC /*< Dynamic, availability file disponible */ + double integrateSimple(double a, double b); + double integrateSimplePoint(double a); + double solveSimple(double a, double amount); + + double *timePoints_; + double *integral_; + int nbPoints_; + int binarySearch(double *array, double a, int low, int high); }; -typedef struct surf_cpu_ti_tgmr { - trace_type type; - double value; /*< Percentage of cpu power disponible. Value fixed between 0 and 1 */ +enum trace_type { - /* Dynamic */ - double last_time; /*< Integral interval last point (discret time) */ - double total; /*< Integral total between 0 and last_pointn */ + TRACE_FIXED, /*< Trace fixed, no availability file */ + TRACE_DYNAMIC /*< Dynamic, have an availability file */ +}; - surf_cpu_ti_trace_t trace; - tmgr_trace_t power_trace; +class CpuTiTgmr { +public: + CpuTiTgmr(trace_type type, double value) + : type_(type), value_(value) + {}; + CpuTiTgmr(tmgr_trace_t speedTrace, double value); + ~CpuTiTgmr(); -} s_surf_cpu_ti_tgmr_t, *surf_cpu_ti_tgmr_t; + double integrate(double a, double b); + double solve(double a, double amount); + double solveSomewhatSimple(double a, double amount); + double getPowerScale(double a); + trace_type type_; + double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */ -/********* - * Model * - *********/ -class CpuTiModel : public CpuModel { -public: - CpuTiModel(); - ~CpuTiModel() {} + /* Dynamic */ + double lastTime_ = 0.0; /*< Integral interval last point (discrete time) */ + double total_ = 0.0; /*< Integral total between 0 and last_pointn */ - CpuTiPtr createResource(string name, double power_peak, 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); + CpuTiTrace *trace_ = nullptr; + tmgr_trace_t speedTrace_ = nullptr; +}; -protected: - void NotifyResourceTurnedOn(ResourcePtr r){}; - void NotifyResourceTurnedOff(ResourcePtr r){}; +/********** + * Action * + **********/ - void NotifyActionCancel(ActionPtr a){}; - void NotifyActionResume(ActionPtr a){}; - void NotifyActionSuspend(ActionPtr a){}; +class CpuTiAction: public CpuAction { + friend class CpuTi; +public: + CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu); + + void setState(simgrid::surf::Action::State 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 *cpu_; + int indexHeap_; + int suspended_ = 0; +public: + 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 Cpu { public: - CpuTi(CpuTiModelPtr model, string name, double powerPeak, - 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 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 */ - double m_sumPriority; /*< the sum of actions' priority that are running on cpu */ - double m_lastUpdate; /*< last update of actions' remaining amount done */ + CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core); + ~CpuTi() override; + + void setSpeedTrace(tmgr_trace_t trace) override; + + void apply_event(tmgr_trace_iterator_t event, double value) override; + void updateActionsFinishTime(double now); + 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 *speedIntegratedTrace_ = NULL;/*< Structure with data needed to integrate trace file */ + ActionTiList *actionSet_ = NULL; /*< set with all actions running on cpu */ + double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */ + double lastUpdate_ = 0; /*< last update of actions' remaining amount done */ + + double currentFrequency_; + +public: + boost::intrusive::list_member_hook<> cpu_ti_hook; }; -/********** - * Action * - **********/ -class CpuTiAction: public CpuAction { +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): CpuAction(model, cost, failed) {}; + CpuTiModel(); + ~CpuTiModel() override; + Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) override; + double next_occuring_event(double now) override; + void updateActionsState(double now, double delta) override; + + ActionList *runningActionSetThatDoesNotNeedBeingChecked_; + CpuTiList *modifiedCpu_; + xbt_heap_t tiActionHeap_; - virtual double getRemains(); - virtual double getStartTime(); - virtual double getFinishTime(); +protected: + void NotifyResourceTurnedOn(simgrid::surf::Resource*){}; + void NotifyResourceTurnedOff(simgrid::surf::Resource*){}; + + void NotifyActionCancel(Action*){}; + void NotifyActionResume(Action*){}; + void NotifyActionSuspend(Action*){}; }; + +} +}