X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..4576fd50919e2cffe68e4b86943709f42eaea60f:/src/surf/cpu_cas01.hpp diff --git a/src/surf/cpu_cas01.hpp b/src/surf/cpu_cas01.hpp index 7ed577b719..139c30310a 100644 --- a/src/surf/cpu_cas01.hpp +++ b/src/surf/cpu_cas01.hpp @@ -3,9 +3,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 "cpu_interface.hpp" +#include "xbt/base.h" /*********** * Classes * @@ -24,11 +23,10 @@ class XBT_PRIVATE CpuCas01Action; class CpuCas01Model : public simgrid::surf::CpuModel { public: - CpuCas01Model(); + explicit CpuCas01Model(kernel::resource::Model::UpdateAlgo algo); ~CpuCas01Model() override; - Cpu *createCpu(simgrid::s4u::Host *host, std::vector *speedPerPstate, int core) override; - kernel::resource::Action::StateSet cpuRunningActionSetThatDoesNotNeedBeingChecked_; + Cpu* create_cpu(simgrid::s4u::Host* host, std::vector* speed_per_pstate, int core) override; }; /************ @@ -44,12 +42,10 @@ public: CpuAction* execution_start(double size, int requestedCore) override; CpuAction* sleep(double duration) override; - bool isUsed() override; - - std::vector * getSpeedPeakList(); // FIXME: killme to hide our internals + bool is_used() override; protected: - void onSpeedChange() override; + void on_speed_change() override; }; /********** @@ -64,10 +60,10 @@ public: CpuCas01Action(kernel::resource::Model* model, double cost, bool failed, double speed, kernel::lmm::Constraint* constraint); ~CpuCas01Action() override; - int requestedCore(); + int requested_core(); private: - int requestedCore_ = 1; + int requested_core_ = 1; }; }