X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5cffdb73a735193bfeaa5537b0c6e60707ee947e..f9dd39e26289f9ba2d4ef96fbbed1709bff22043:/src/surf/host_ptask_L07.hpp diff --git a/src/surf/host_ptask_L07.hpp b/src/surf/host_ptask_L07.hpp index 89d109f414..3754b67fac 100644 --- a/src/surf/host_ptask_L07.hpp +++ b/src/surf/host_ptask_L07.hpp @@ -94,8 +94,8 @@ public: class CpuL07 : public Cpu { friend void HostL07Model::addTraces(); - tmgr_trace_iterator_t p_stateEvent; - tmgr_trace_iterator_t p_speedEvent; + tmgr_trace_iterator_t p_stateEvent = nullptr; + tmgr_trace_iterator_t p_speedEvent = nullptr; public: CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeakList, int pstate, double power_scale, tmgr_trace_t power_trace, @@ -103,7 +103,7 @@ public: ~CpuL07(); bool isUsed() override; void updateState(tmgr_trace_iterator_t event_type, double value, double date) override; - Action *execute(double size) override; + Action *execution_start(double size) override; Action *sleep(double duration) override; protected: void onSpeedChange() override; @@ -134,12 +134,12 @@ public: * Action * **********/ class L07Action : public CpuAction { - friend Action *CpuL07::execute(double size); + friend Action *CpuL07::execution_start(double size); friend Action *CpuL07::sleep(double duration); friend Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t*host_list, double *flops_amount, - double *bytes_amount, + double *bytes_amount, double rate); public: L07Action(Model *model, int host_nb, @@ -152,11 +152,6 @@ public: void updateBound(); int unref() override; - void suspend() override; - void resume() override; - void setMaxDuration(double duration) override; - void setPriority(double priority) override; - double getRemains() override; std::vector * p_netcardList = new std::vector(); double *p_computationAmount;