X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9fc9b3239f3f2a3a5441fe5c8bac82c1ffa3c9d0..02dd785d0212ccd8376c2ce4fd931942232fcafb:/src/surf/cpu_ti.hpp diff --git a/src/surf/cpu_ti.hpp b/src/surf/cpu_ti.hpp index ea853280a5..4f70915a7f 100644 --- a/src/surf/cpu_ti.hpp +++ b/src/surf/cpu_ti.hpp @@ -4,6 +4,8 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ +#include + #include #include "src/surf/cpu_interface.hpp" @@ -32,7 +34,7 @@ struct tiTag; *********/ class CpuTiTrace { public: - CpuTiTrace(tmgr_trace_t speedTrace); + explicit CpuTiTrace(tmgr_trace_t speedTrace); ~CpuTiTrace(); double integrateSimple(double a, double b); @@ -84,7 +86,7 @@ class CpuTiAction: public CpuAction { public: CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu); - void setState(e_surf_action_state_t state) override; + void setState(simgrid::surf::Action::State state) override; int unref() override; void cancel() override; void updateIndexHeap(int i); @@ -111,7 +113,7 @@ typedef boost::intrusive::list ActionTiList; class CpuTi : public Cpu { public: CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core); - ~CpuTi(); + ~CpuTi() override; void setSpeedTrace(tmgr_trace_t trace) override; @@ -146,8 +148,8 @@ typedef boost::intrusive::list CpuTiList; class CpuTiModel : public CpuModel { public: CpuTiModel(); - ~CpuTiModel(); - Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speeds, int core) override; + ~CpuTiModel() override; + Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) override; double next_occuring_event(double now) override; void updateActionsState(double now, double delta) override;