cosmetics around surf::Resouce::apply_event()

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

diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp
index 88c6386..d2022aa 100644 (file)
--- a/src/surf/cpu_cas01.hpp
+++ b/src/surf/cpu_cas01.hpp
@@ -32,8 +32,7 @@ public:
                           tmgr_trace_t speedTrace, int core,
                           int initiallyOn,
                           tmgr_trace_t state_trace) override;
                           tmgr_trace_t speedTrace, int core,
                           int initiallyOn,
                           tmgr_trace_t state_trace) override;

-  double shareResourcesFull(double now) override;
-  void addTraces() override;
+  double next_occuring_event_full(double now) override;

   ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
 };
 
   ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
 };
 


@@ -42,13 +41,12 @@ public:
  ************/
 
 class CpuCas01 : public Cpu {
  ************/
 
 class CpuCas01 : public Cpu {

-  friend CpuCas01Model;

 public:
   CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
         int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
         int initiallyOn, tmgr_trace_t stateTrace) ;
   ~CpuCas01();
 public:
   CpuCas01(CpuCas01Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
         int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
         int initiallyOn, tmgr_trace_t stateTrace) ;
   ~CpuCas01();

-  void updateState(tmgr_trace_iterator_t event_type, double value, double date) override;
+  void apply_event(tmgr_trace_iterator_t event, double value) override;

   CpuAction *execution_start(double size) override;
   CpuAction *sleep(double duration) override;
 
   CpuAction *execution_start(double size) override;
   CpuAction *sleep(double duration) override;
 


@@ -58,11 +56,6 @@ public:
 
 protected:
   void onSpeedChange() override;
 
 protected:
   void onSpeedChange() override;

-
-private:
-
-  tmgr_trace_iterator_t p_stateEvent = nullptr;
-  tmgr_trace_iterator_t p_speedEvent = nullptr;

 };
 
 /**********
 };
 
 /**********