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

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 014789a0fc..7ad6573b60 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -1,4 +1,4 @@
-/* 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. */
@@ -6,13 +6,15 @@
 #ifndef SURF_MODEL_CPUTI_H_
 #define SURF_MODEL_CPUTI_H_
 
+#include "src/kernel/resource/profile/Profile.hpp"
 #include "src/surf/cpu_interface.hpp"
-#include "src/surf/trace_mgr.hpp"
 
 #include <boost/intrusive/list.hpp>
+#include <memory>
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 /***********
  * Classes *
@@ -23,21 +25,17 @@ 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);
 
   double integrate_simple(double a, double b);
   double integrate_simple_point(double a);
   double solve_simple(double a, double amount);
 
-  double* time_points_;
-  double *integral_;
-  int nb_points_;
-  int binary_search(double* array, double a, int low, int high);
+  std::vector<double> time_points_;
+  std::vector<double> integral_;
+  static int binary_search(const std::vector<double>& array, double a);
 };
 
 class CpuTiTmgr {
@@ -48,10 +46,9 @@ class CpuTiTmgr {
 
 public:
   explicit CpuTiTmgr(double value) : type_(Type::FIXED), value_(value){};
-  CpuTiTmgr(tmgr_trace_t speed_trace, double value);
+  CpuTiTmgr(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);
@@ -65,8 +62,8 @@ private:
   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;
+  std::unique_ptr<CpuTiProfile> profile_ = nullptr;
+  profile::Profile* speed_profile_       = nullptr;
 };
 
 /**********
@@ -77,14 +74,16 @@ 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;
   void set_max_duration(double duration) override;
-  void set_priority(double priority) override;
+  void set_sharing_penalty(double sharing_penalty) override;
   double get_remains() override;
 
   CpuTi *cpu_;
@@ -100,23 +99,25 @@ 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 requested_cores) override
+  CpuAction* execution_start(double size) override;
+  CpuAction* execution_start(double, int) override
   {
     THROW_UNIMPLEMENTED;
     return nullptr;
   }
-  CpuAction *sleep(double duration) override;
+  CpuAction* sleep(double duration) override;
   double get_speed_ratio() override;
 
   void set_modified(bool modified);
@@ -140,15 +141,18 @@ public:
   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* create_cpu(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_ */