/* 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 <boost/intrusive/list.hpp>
+
#include <xbt/base.h>
#include "src/surf/cpu_interface.hpp"
*********/
class CpuTiTrace {
public:
- CpuTiTrace(tmgr_trace_t speedTrace);
+ explicit CpuTiTrace(tmgr_trace_t speedTrace);
~CpuTiTrace();
double integrateSimple(double a, double b);
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);
void setMaxDuration(double duration) override;
void setPriority(double priority) override;
double getRemains() override;
- void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {};
CpuTi *cpu_;
int indexHeap_;
************/
class CpuTi : public Cpu {
public:
- CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- tmgr_trace_t speedTrace, int core,
- tmgr_trace_t stateTrace) ;
- ~CpuTi();
+ CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, std::vector<double> *speedPerPstate, int core);
+ ~CpuTi() override;
void setSpeedTrace(tmgr_trace_t trace) override;
void modified(bool modified);
- CpuTiTgmr *availTrace_; /*< Structure with data needed to integrate trace file */
- ActionTiList *actionSet_; /*< set with all actions running on cpu */
- double sumPriority_; /*< the sum of actions' priority that are running on cpu */
- double lastUpdate_ = 0; /*< last update of actions' remaining amount done */
+ CpuTiTgmr *speedIntegratedTrace_ = nullptr;/*< Structure with data needed to integrate trace file */
+ ActionTiList *actionSet_ = nullptr; /*< set with all actions running on cpu */
+ double sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */
+ double lastUpdate_ = 0; /*< last update of actions' remaining amount done */
double currentFrequency_;
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
- ~CpuTiModel();
- Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- tmgr_trace_t speedTrace, int core, tmgr_trace_t state_trace) override;
+ ~CpuTiModel() override;
+ Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double>* speedPerPstate, int core) override;
double next_occuring_event(double now) override;
void updateActionsState(double now, double delta) override;