-/* Copyright (c) 2013-2015. The SimGrid Team.
+/* Copyright (c) 2013-2017. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
void setState(simgrid::surf::Action::State state) override;
int unref() override;
void cancel() override;
- void updateIndexHeap(int i) override;
void suspend() override;
void resume() override;
void setMaxDuration(double duration) override;
void modified(bool modified);
CpuTiTgmr *speedIntegratedTrace_ = nullptr;/*< Structure with data needed to integrate trace file */
- ActionTiList *actionSet_ = nullptr; /*< set with all actions running on cpu */
+ ActionTiList actionSet_; /*< 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 */
*********/
class CpuTiModel : public CpuModel {
public:
- CpuTiModel();
+ CpuTiModel() = default;
~CpuTiModel() override;
Cpu *createCpu(simgrid::s4u::Host *host, std::vector<double>* speedPerPstate, int core) override;
double nextOccuringEvent(double now) override;
void updateActionsState(double now, double delta) override;
- ActionList *runningActionSetThatDoesNotNeedBeingChecked_;
- CpuTiList *modifiedCpu_;
- xbt_heap_t tiActionHeap_;
+ ActionList runningActionSetThatDoesNotNeedBeingChecked_;
+ CpuTiList modifiedCpu_;
};
}