X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef33b9c0c2c0e9c15c27fce82515a23e8aadc0ed..ebc355d0c96552d0bc2aa301d90723490337bca3:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 2b37326c97..2b3dff1f50 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -1,17 +1,15 @@ -/* Copyright (c) 2013-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2013-2019. 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 +#ifndef SURF_MODEL_CPUTI_H_ +#define SURF_MODEL_CPUTI_H_ +#include "src/kernel/resource/profile/trace_mgr.hpp" #include "src/surf/cpu_interface.hpp" -#include "src/surf/trace_mgr.hpp" -#include "surf/surf_routing.h" -/* Epsilon */ -#define EPSILON 0.000000001 +#include namespace simgrid { namespace surf { @@ -19,86 +17,80 @@ namespace surf { /*********** * Classes * ***********/ -class XBT_PRIVATE CpuTiTrace; -class XBT_PRIVATE CpuTiTgmr; class XBT_PRIVATE CpuTiModel; class XBT_PRIVATE CpuTi; -class XBT_PRIVATE CpuTiAction; - -struct tiTag; /********* * Trace * *********/ -class CpuTiTrace { +class CpuTiProfile { public: - CpuTiTrace(tmgr_trace_t speedTrace); - ~CpuTiTrace(); + explicit CpuTiProfile(kernel::profile::Profile* profile); + CpuTiProfile(const CpuTiProfile&) = delete; + CpuTiProfile& operator=(const CpuTiProfile&) = delete; + ~CpuTiProfile(); - double integrateSimple(double a, double b); - double integrateSimplePoint(double a); - double solveSimple(double a, double amount); + double integrate_simple(double a, double b); + double integrate_simple_point(double a); + double solve_simple(double a, double amount); - double *timePoints_; + double* time_points_; double *integral_; - int nbPoints_; - int binarySearch(double *array, double a, int low, int high); + int nb_points_; + int binary_search(double* array, double a, int low, int high); }; -enum trace_type { - - TRACE_FIXED, /*< Trace fixed, no availability file */ - TRACE_DYNAMIC /*< Dynamic, have an availability file */ -}; +class CpuTiTmgr { + enum class Type { + FIXED, /*< Trace fixed, no availability file */ + DYNAMIC /*< Dynamic, have an availability file */ + }; -class CpuTiTgmr { public: - CpuTiTgmr(trace_type type, double value) - : type_(type), value_(value) - {}; - CpuTiTgmr(tmgr_trace_t speedTrace, double value); - ~CpuTiTgmr(); + explicit CpuTiTmgr(double value) : type_(Type::FIXED), value_(value){}; + CpuTiTmgr(kernel::profile::Profile* speed_profile, double value); + CpuTiTmgr(const CpuTiTmgr&) = delete; + CpuTiTmgr& operator=(const CpuTiTmgr&) = delete; + ~CpuTiTmgr(); double integrate(double a, double b); double solve(double a, double amount); - double solveSomewhatSimple(double a, double amount); - double getPowerScale(double a); + double get_power_scale(double a); - trace_type type_; +private: + Type type_; double value_; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */ /* Dynamic */ - double lastTime_ = 0.0; /*< Integral interval last point (discrete time) */ + double last_time_ = 0.0; /*< Integral interval last point (discrete time) */ double total_ = 0.0; /*< Integral total between 0 and last_pointn */ - CpuTiTrace *trace_ = nullptr; - tmgr_trace_t speedTrace_ = nullptr; + CpuTiProfile* profile_ = nullptr; + kernel::profile::Profile* speed_profile_ = nullptr; }; /********** * Action * **********/ -class CpuTiAction: public CpuAction { +class XBT_PRIVATE CpuTiAction : public CpuAction { friend class CpuTi; public: - CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu); + CpuTiAction(CpuTi* cpu, double cost); + CpuTiAction(const CpuTiAction&) = delete; + CpuTiAction& operator=(const CpuTiAction&) = delete; + ~CpuTiAction(); - void setState(e_surf_action_state_t state) override; - int unref() override; + void set_state(kernel::resource::Action::State state) 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 {}; + void set_max_duration(double duration) override; + void set_priority(double priority) override; + double get_remains() override; CpuTi *cpu_; - int indexHeap_; - int suspended_ = 0; -public: + boost::intrusive::list_member_hook<> action_ti_hook; }; @@ -110,32 +102,34 @@ typedef boost::intrusive::list ActionTiList; ************/ class CpuTi : public Cpu { public: - CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak, - tmgr_trace_t speedTrace, int core, - tmgr_trace_t stateTrace) ; - ~CpuTi(); + CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core); + CpuTi(const CpuTi&) = delete; + CpuTi& operator&(const CpuTi&) = delete; + ~CpuTi() override; - void setSpeedTrace(tmgr_trace_t trace) override; + void set_speed_profile(kernel::profile::Profile* profile) override; - void apply_event(tmgr_trace_iterator_t event, double value) override; - void updateActionsFinishTime(double now); - void updateRemainingAmount(double now); + void apply_event(kernel::profile::Event* event, double value) override; + void update_actions_finish_time(double now); + void update_remaining_amount(double now); - bool isUsed() override; + bool is_used() override; CpuAction *execution_start(double size) override; + kernel::resource::Action* execution_start(double, int) override + { + THROW_UNIMPLEMENTED; + return nullptr; + } CpuAction *sleep(double duration) override; - double getAvailableSpeed() override; - - void modified(bool modified); + double get_speed_ratio() override; - CpuTiTgmr *availTrace_; /*< Structure with data needed to integrate trace file */ - ActionTiList *actionSet_; /*< set with all actions running on cpu */ - double sumPriority_; /*< the sum of actions' priority that are running on cpu */ - double lastUpdate_ = 0; /*< last update of actions' remaining amount done */ + void set_modified(bool modified); - double currentFrequency_; + CpuTiTmgr* speed_integrated_trace_ = nullptr; /*< Structure with data needed to integrate trace file */ + ActionTiList action_set_; /*< set with all actions running on cpu */ + double sum_priority_ = 0; /*< the sum of actions' priority that are running on cpu */ + double last_update_ = 0; /*< last update of actions' remaining amount done */ -public: boost::intrusive::list_member_hook<> cpu_ti_hook; }; @@ -147,25 +141,20 @@ typedef boost::intrusive::list CpuTiList; *********/ class CpuTiModel : public CpuModel { public: + static void create_pm_vm_models(); // Make both models be TI models + CpuTiModel(); - ~CpuTiModel(); - Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak, - tmgr_trace_t speedTrace, int core, tmgr_trace_t state_trace) override; + CpuTiModel(const CpuTiModel&) = delete; + CpuTiModel& operator=(const CpuTiModel&) = delete; + ~CpuTiModel() override; + Cpu* create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, 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_; + void update_actions_state(double now, double delta) override; -protected: - void NotifyResourceTurnedOn(simgrid::surf::Resource*){}; - void NotifyResourceTurnedOff(simgrid::surf::Resource*){}; - - void NotifyActionCancel(Action*){}; - void NotifyActionResume(Action*){}; - void NotifyActionSuspend(Action*){}; + CpuTiList modified_cpus_; }; } } + +#endif /* SURF_MODEL_CPUTI_H_ */