X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bba28202d80db522aef1af8dd81c9b9e3e0d3049..fdab189916cad1bf47afa4f3c272c8ba26c36ed1:/src/surf/cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index a4f918404a..fa3a3e83fc 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -1,20 +1,19 @@
-/* Copyright (c) 2013-2018. 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 <boost/intrusive/list.hpp>
-
-#include <xbt/base.h>
+#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"
 
-/* Epsilon */
-#define EPSILON 0.000000001
+#include <boost/intrusive/list.hpp>
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 /***********
  * Classes *
@@ -25,12 +24,12 @@ class XBT_PRIVATE CpuTi;
 /*********
  * Trace *
  *********/
-class CpuTiTrace {
+class CpuTiProfile {
 public:
-  explicit CpuTiTrace(tmgr_trace_t speedTrace);
-  CpuTiTrace(const CpuTiTrace&) = delete;
-  CpuTiTrace& operator=(const CpuTiTrace&) = delete;
-  ~CpuTiTrace();
+  explicit CpuTiProfile(profile::Profile* profile);
+  CpuTiProfile(const CpuTiProfile&) = delete;
+  CpuTiProfile& operator=(const CpuTiProfile&) = delete;
+  ~CpuTiProfile();
 
   double integrate_simple(double a, double b);
   double integrate_simple_point(double a);
@@ -42,16 +41,15 @@ public:
   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 */
+  };
+
 public:
-  CpuTiTmgr(trace_type type, double value) : type_(type), value_(value){};
-  CpuTiTmgr(tmgr_trace_t speedTrace, double value);
+  explicit CpuTiTmgr(double value) : type_(Type::FIXED), value_(value){};
+  CpuTiTmgr(profile::Profile* speed_profile, double value);
   CpuTiTmgr(const CpuTiTmgr&) = delete;
   CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
   ~CpuTiTmgr();
@@ -60,15 +58,16 @@ public:
   double solve(double a, double amount);
   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 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 speed_trace_ = nullptr;
+  CpuTiProfile* profile_                   = nullptr;
+  profile::Profile* speed_profile_         = nullptr;
 };
 
 /**********
@@ -79,9 +78,11 @@ class XBT_PRIVATE CpuTiAction : public CpuAction {
   friend class CpuTi;
 public:
   CpuTiAction(CpuTi* cpu, double cost);
+  CpuTiAction(const CpuTiAction&) = delete;
+  CpuTiAction& operator=(const CpuTiAction&) = delete;
   ~CpuTiAction();
 
-  void set_state(kernel::resource::Action::State state) override;
+  void set_state(Action::State state) override;
   void cancel() override;
   void suspend() override;
   void resume() override;
@@ -102,24 +103,26 @@ typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
  ************/
 class CpuTi : public Cpu {
 public:
-  CpuTi(CpuTiModel* model, simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core);
+  CpuTi(CpuTiModel* model, s4u::Host* host, const std::vector<double>& speed_per_pstate, int core);
+  CpuTi(const CpuTi&)            = delete;
+  CpuTi& operator&(const CpuTi&) = delete;
   ~CpuTi() override;
 
-  void set_speed_trace(tmgr_trace_t trace) override;
+  void set_speed_profile(profile::Profile* profile) override;
 
-  void apply_event(tmgr_trace_event_t event, double value) override;
+  void apply_event(profile::Event* event, double value) override;
   void update_actions_finish_time(double now);
   void update_remaining_amount(double now);
 
   bool is_used() override;
-  CpuAction *execution_start(double size) override;
-  simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override
+  CpuAction* execution_start(double size) override;
+  Action* execution_start(double, int) override
   {
     THROW_UNIMPLEMENTED;
     return nullptr;
   }
-  CpuAction *sleep(double duration) override;
-  double get_available_speed() override;
+  CpuAction* sleep(double duration) override;
+  double get_speed_ratio() override;
 
   void set_modified(bool modified);
 
@@ -139,14 +142,21 @@ typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
  *********/
 class CpuTiModel : public CpuModel {
 public:
-  CpuTiModel() : CpuModel(Model::UpdateAlgo::Full){};
+  static void create_pm_vm_models(); // Make both models be TI models
+
+  CpuTiModel();
+  CpuTiModel(const CpuTiModel&) = delete;
+  CpuTiModel& operator=(const CpuTiModel&) = delete;
   ~CpuTiModel() override;
-  Cpu* createCpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
+  Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate, int core) override;
   double next_occuring_event(double now) override;
   void update_actions_state(double now, double delta) override;
 
   CpuTiList modified_cpus_;
 };
 
-}
-}
+} // namespace resource
+} // namespace kernel
+} // namespace simgrid
+
+#endif /* SURF_MODEL_CPUTI_H_ */