X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/24e3d7b3bb3312445ad0986fc67853995031bea0..16bbb8a8212497d9c44c81333ed2c0e689e0c5af:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index be3b5617b3..d4d305a6b5 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -6,8 +6,8 @@ #include -#include "cpu_interface.hpp" -#include "trace_mgr_private.h" +#include "src/surf/cpu_interface.hpp" +#include "src/surf/trace_mgr.hpp" #include "surf/surf_routing.h" /* Epsilon */ @@ -55,7 +55,7 @@ class CpuTiTgmr { public: CpuTiTgmr(trace_type type, double value) : m_type(type), m_value(value) - {}; + {}; CpuTiTgmr(tmgr_trace_t speedTrace, double value); ~CpuTiTgmr(); @@ -118,18 +118,18 @@ public: int initiallyOn, tmgr_trace_t stateTrace) ; ~CpuTi(); - void updateState(tmgr_trace_event_t event_type, double value, double date) override; + void set_speed_trace(tmgr_trace_t trace); + + void updateState(tmgr_trace_iterator_t event_type, double value, double date) override; void updateActionsFinishTime(double now); bool isUsed() override; - CpuAction *execute(double size) override; + CpuAction *execution_start(double size) override; CpuAction *sleep(double duration) override; double getAvailableSpeed() override; void modified(bool modified); CpuTiTgmr *p_availTrace; /*< Structure with data needed to integrate trace file */ - tmgr_trace_event_t p_stateEvent = NULL; /*< trace file with states events (ON or OFF) */ - tmgr_trace_event_t p_speedEvent = NULL; /*< trace file with availability events */ ActionTiList *p_actionSet; /*< set with all actions running on cpu */ double m_sumPriority; /*< the sum of actions' priority that are running on cpu */ double m_lastUpdate = 0; /*< last update of actions' remaining amount done */ @@ -156,7 +156,7 @@ public: int pstate, double speedScale, tmgr_trace_t speedTrace, int core, int initiallyOn, - tmgr_trace_t state_trace); + tmgr_trace_t state_trace) override; double shareResources(double now) override; void updateActionsState(double now, double delta) override; void addTraces() override;