even more cleanups in the routing

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

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index d4d305a..1f8bb91 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -118,10 +118,12 @@ public:
         int initiallyOn, tmgr_trace_t stateTrace) ;
   ~CpuTi();
 
-  void set_speed_trace(tmgr_trace_t trace);
+  void set_speed_trace(tmgr_trace_t trace) override;
 
-  void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
+  void apply_event(tmgr_trace_iterator_t event, double value) override;
   void updateActionsFinishTime(double now);
+  void updateRemainingAmount(double now);
+
   bool isUsed() override;
   CpuAction *execution_start(double size) override;
   CpuAction *sleep(double duration) override;
@@ -136,7 +138,6 @@ public:
 
   double current_frequency;
 
-  void updateRemainingAmount(double now);
 public:
   boost::intrusive::list_member_hook<> cpu_ti_hook;
 };
@@ -155,11 +156,9 @@ public:
   Cpu *createCpu(simgrid::s4u::Host *host,  xbt_dynar_t speedPeak,
                           int pstate, double speedScale,
                           tmgr_trace_t speedTrace, int core,
-                          int initiallyOn,
-                          tmgr_trace_t state_trace) override;
-  double shareResources(double now) override;
+                          int initiallyOn, tmgr_trace_t state_trace) override;
+  double next_occuring_event(double now) override;
   void updateActionsState(double now, double delta) override;
-  void addTraces() override;
 
   ActionList *p_runningActionSetThatDoesNotNeedBeingChecked;
   CpuTiList *p_modifiedCpu;