X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c01336cbfb90976b513b71718a748b3a01a8e6a..19cd5a52131b50275fa26e0e53c4a8bd333f2937:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index 4059783161..4bdbe144ed 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -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,16 +88,14 @@ public: void setState(simgrid::surf::Action::State state) override; int unref() override; void cancel() override; - void updateIndexHeap(int i); + void updateIndexHeap(int i) override; 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_ = -1; - int suspended_ = 0; boost::intrusive::list_member_hook<> action_ti_hook; }; @@ -154,14 +151,6 @@ public: 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*){}; }; }