Merge maxmin_private.hpp into maxmin.hpp.

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

diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp
index b99ecd3..1789127 100644 (file)
--- a/src/surf/cpu_ti.hpp
+++ b/src/surf/cpu_ti.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,7 +10,6 @@
 
 #include "src/surf/cpu_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
-#include "surf/surf_routing.h"
 
 /* Epsilon */
 #define EPSILON 0.000000001
@@ -89,17 +88,14 @@ public:
   void setState(simgrid::surf::Action::State state) override;
   int unref() override;
   void cancel() override;
-  void updateIndexHeap(int i);
   void suspend() override;
   void resume() override;
   void setMaxDuration(double duration) override;
-  void setPriority(double priority) override;
+  void setSharingWeight(double priority) override;
   double getRemains() override;
 
   CpuTi *cpu_;
-  int indexHeap_;
-  int suspended_ = 0;
-public:
+
   boost::intrusive::list_member_hook<> action_ti_hook;
 };
 
@@ -116,7 +112,7 @@ public:
 
   void setSpeedTrace(tmgr_trace_t trace) override;
 
-  void apply_event(tmgr_trace_iterator_t event, double value) override;
+  void apply_event(tmgr_trace_event_t event, double value) override;
   void updateActionsFinishTime(double now);
   void updateRemainingAmount(double now);
 
@@ -134,7 +130,6 @@ public:
 
   double currentFrequency_;
 
-public:
   boost::intrusive::list_member_hook<> cpu_ti_hook;
 };
 
@@ -149,20 +144,11 @@ public:
   CpuTiModel();
   ~CpuTiModel() override;
   Cpu *createCpu(simgrid::s4u::Host *host,  std::vector<double>* speedPerPstate, int core) override;
-  double next_occuring_event(double now) override;
+  double nextOccuringEvent(double now) override;
   void updateActionsState(double now, double delta) override;
 
   ActionList *runningActionSetThatDoesNotNeedBeingChecked_;
   CpuTiList *modifiedCpu_;
-  xbt_heap_t tiActionHeap_;
-
-protected:
-  void NotifyResourceTurnedOn(simgrid::surf::Resource*){};
-  void NotifyResourceTurnedOff(simgrid::surf::Resource*){};
-
-  void NotifyActionCancel(Action*){};
-  void NotifyActionResume(Action*){};
-  void NotifyActionSuspend(Action*){};
 };
 
 }