X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8d000a773b5ebcd411b28c31de68eeddf804e66b..a9113d6f217e32068b356fa249923e0c9be5a5b7:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 9c46c462a6..609cff94f7 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -1,14 +1,15 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. +/* Copyright (c) 2013-2017. 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 @@ -32,16 +33,16 @@ struct tiTag; *********/ class CpuTiTrace { public: - CpuTiTrace(tmgr_trace_t speedTrace); + explicit CpuTiTrace(tmgr_trace_t speedTrace); ~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; + double *timePoints_; + double *integral_; + int nbPoints_; int binarySearch(double *array, double a, int low, int high); }; @@ -54,8 +55,8 @@ enum trace_type { class CpuTiTgmr { public: CpuTiTgmr(trace_type type, double value) - : m_type(type), m_value(value) - {}; + : type_(type), value_(value) + {}; CpuTiTgmr(tmgr_trace_t speedTrace, double value); ~CpuTiTgmr(); @@ -64,15 +65,15 @@ public: double solveSomewhatSimple(double a, double amount); double getPowerScale(double a); - trace_type m_type; - double m_value; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */ + trace_type type_; + double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */ /* Dynamic */ - double m_lastTime = 0.0; /*< Integral interval last point (discrete time) */ - double m_total = 0.0; /*< Integral total between 0 and last_pointn */ + double lastTime_ = 0.0; /*< Integral interval last point (discrete time) */ + double total_ = 0.0; /*< Integral total between 0 and last_pointn */ - CpuTiTrace *p_trace = nullptr; - tmgr_trace_t p_speedTrace = nullptr; + CpuTiTrace *trace_ = nullptr; + tmgr_trace_t speedTrace_ = nullptr; }; /********** @@ -82,44 +83,39 @@ public: class CpuTiAction: public CpuAction { friend class CpuTi; public: - CpuTiAction(CpuTiModel *model, double cost, bool failed, - CpuTi *cpu); + CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu); - void setState(e_surf_action_state_t state) override; + 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; + void setSharingWeight(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: + CpuTi *cpu_; + 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; +typedef boost::intrusive::member_hook, &CpuTiAction::action_ti_hook> ActionTiListOptions; +typedef boost::intrusive::list ActionTiList; /************ * Resource * ************/ class CpuTi : public Cpu { public: - 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(); + CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector *speedPerPstate, int core); + ~CpuTi() override; - void updateState(tmgr_trace_iterator_t event_type, double value, double date) override; + void setSpeedTrace(tmgr_trace_t trace) override; + + void apply_event(tmgr_trace_event_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; @@ -127,20 +123,17 @@ public: 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 = 0; /*< last update of actions' remaining amount done */ + CpuTiTgmr *speedIntegratedTrace_ = nullptr;/*< Structure with data needed to integrate trace file */ + ActionTiList actionSet_; /*< 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 current_frequency; + double currentFrequency_; - void updateRemainingAmount(double now); -public: boost::intrusive::list_member_hook<> cpu_ti_hook; }; -typedef boost::intrusive::member_hook< - CpuTi, boost::intrusive::list_member_hook<>, &CpuTi::cpu_ti_hook> CpuTiListOptions; +typedef boost::intrusive::member_hook, &CpuTi::cpu_ti_hook> CpuTiListOptions; typedef boost::intrusive::list CpuTiList; /********* @@ -148,28 +141,14 @@ typedef boost::intrusive::list CpuTiList; *********/ class CpuTiModel : public CpuModel { public: - 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 shareResources(double now) override; + CpuTiModel() = default; + ~CpuTiModel() override; + Cpu *createCpu(simgrid::s4u::Host *host, std::vector* speedPerPstate, int core) override; + double nextOccuringEvent(double now) override; void updateActionsState(double now, double delta) override; - void addTraces() 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*){}; + ActionList runningActionSetThatDoesNotNeedBeingChecked_; + CpuTiList modifiedCpu_; }; }