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

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index 1789127e20..ec9d0a0118 100644
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2017. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2018. 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. */
@@ -84,15 +83,15 @@ class CpuTiAction: public CpuAction {
   friend class CpuTi;
 public:
   CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu);
+  ~CpuTiAction();
 
-  void setState(simgrid::surf::Action::State state) override;
-  int unref() override;
+  void set_state(simgrid::kernel::resource::Action::State state) override;
   void cancel() override;
   void suspend() override;
   void resume() override;
-  void setMaxDuration(double duration) override;
-  void setSharingWeight(double priority) override;
-  double getRemains() override;
+  void set_max_duration(double duration) override;
+  void set_priority(double priority) override;
+  double get_remains() override;
 
   CpuTi *cpu_;
 
@@ -118,13 +117,18 @@ public:
 
   bool isUsed() override;
   CpuAction *execution_start(double size) override;
+  simgrid::kernel::resource::Action* execution_start(double size, int requestedCores) override
+  {
+    THROW_UNIMPLEMENTED;
+    return nullptr;
+  }
   CpuAction *sleep(double duration) override;
   double getAvailableSpeed() override;
 
   void modified(bool modified);
 
   CpuTiTgmr *speedIntegratedTrace_ = nullptr;/*< Structure with data needed to integrate trace file */
-  ActionTiList *actionSet_ = nullptr;        /*< set with all actions running on cpu */
+  ActionTiList actionSet_;                   /*< set with all actions running on cpu */
   double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */
   double lastUpdate_ = 0;  /*< last update of actions' remaining amount done */
 
@@ -141,14 +145,14 @@ typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
  *********/
 class CpuTiModel : public CpuModel {
 public:
-  CpuTiModel();
+  CpuTiModel() = default;
   ~CpuTiModel() override;
   Cpu *createCpu(simgrid::s4u::Host *host,  std::vector<double>* speedPerPstate, int core) override;
-  double nextOccuringEvent(double now) override;
-  void updateActionsState(double now, double delta) override;
+  double next_occuring_event(double now) override;
+  void update_actions_state(double now, double delta) override;
 
-  ActionList *runningActionSetThatDoesNotNeedBeingChecked_;
-  CpuTiList *modifiedCpu_;
+  kernel::resource::Action::StateSet runningActionSetThatDoesNotNeedBeingChecked_;
+  CpuTiList modifiedCpu_;
 };
 
 }