Torus/Fat-Tree/Dragonfly: Aggregate callbacks

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

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index fab7a531a75564884d517b1de6bca08d093c61f0..6997bfe5b35d1e92f8eae9b0b99302f93586656a 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -105,7 +105,7 @@ public:
   CpuTi& operator&(const CpuTi&) = delete;
   ~CpuTi() override;
 
-  void set_speed_profile(profile::Profile* profile) override;
+  Cpu* set_speed_profile(profile::Profile* profile) override;
 
   void apply_event(profile::Event* event, double value) override;
   void update_actions_finish_time(double now);
@@ -140,12 +140,11 @@ using CpuTiList = boost::intrusive::list<CpuTi, CpuTiListOptions>;
  *********/
 class CpuTiModel : public CpuModel {
 public:
-  static void create_pm_vm_models(); // Make both models be TI models
+  static void create_pm_models(); // Make CPU PM model
 
-  CpuTiModel();
+  using CpuModel::CpuModel;
   CpuTiModel(const CpuTiModel&) = delete;
   CpuTiModel& operator=(const CpuTiModel&) = delete;
-  ~CpuTiModel() = default;
   Cpu* create_cpu(s4u::Host* host, const std::vector<double>& speed_per_pstate) override;
   double next_occurring_event(double now) override;
   void update_actions_state(double now, double delta) override;