Merge remote-tracking branch 'github/master'

[simgrid.git] / src / surf / cpu_ti.hpp

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index a4f9184..014789a 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -3,15 +3,13 @@
 /* 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/surf/cpu_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 
-/* Epsilon */
-#define EPSILON 0.000000001
+#include <boost/intrusive/list.hpp>
 
 namespace simgrid {
 namespace surf {
@@ -42,16 +40,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(tmgr_trace_t speed_trace, double value);
   CpuTiTmgr(const CpuTiTmgr&) = delete;
   CpuTiTmgr& operator=(const CpuTiTmgr&) = delete;
   ~CpuTiTmgr();
@@ -60,7 +57,8 @@ 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 */
@@ -113,13 +111,13 @@ public:
 
   bool is_used() override;
   CpuAction *execution_start(double size) override;
-  simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override
+  simgrid::kernel::resource::Action* execution_start(double size, int requested_cores) override
   {
     THROW_UNIMPLEMENTED;
     return nullptr;
   }
   CpuAction *sleep(double duration) override;
-  double get_available_speed() override;
+  double get_speed_ratio() override;
 
   void set_modified(bool modified);
 
@@ -139,9 +137,11 @@ 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() override;
-  Cpu* createCpu(simgrid::s4u::Host* host, std::vector<double>* speed_per_pstate, int core) override;
+  Cpu* create_cpu(simgrid::s4u::Host* host, 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;
 
@@ -150,3 +150,5 @@ public:
 
 }
 }
+
+#endif /* SURF_MODEL_CPUTI_H_ */