A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
dict --
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
c39ee40
..
4bdbe14
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-10,7
+10,6
@@
#include "src/surf/cpu_interface.hpp"
#include "src/surf/trace_mgr.hpp"
#include "src/surf/cpu_interface.hpp"
#include "src/surf/trace_mgr.hpp"
-#include "surf/surf_routing.h"
/* Epsilon */
#define EPSILON 0.000000001
/* Epsilon */
#define EPSILON 0.000000001
@@
-89,18
+88,15
@@
public:
void setState(simgrid::surf::Action::State state) override;
int unref() override;
void cancel() override;
void setState(simgrid::surf::Action::State state) override;
int unref() override;
void cancel() override;
- void updateIndexHeap(int i);
+ void updateIndexHeap(int i)
override
;
void suspend() override;
void resume() override;
void setMaxDuration(double duration) override;
void suspend() override;
void resume() override;
void setMaxDuration(double duration) override;
- void set
Priority
(double priority) override;
+ void set
SharingWeight
(double priority) override;
double getRemains() override;
double getRemains() override;
- void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {};
CpuTi *cpu_;
CpuTi *cpu_;
- int indexHeap_;
- int suspended_ = 0;
-public:
+
boost::intrusive::list_member_hook<> action_ti_hook;
};
boost::intrusive::list_member_hook<> action_ti_hook;
};
@@
-112,12
+108,12
@@
typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
************/
class CpuTi : public Cpu {
public:
************/
class CpuTi : public Cpu {
public:
- CpuTi(CpuTiModel *model, simgrid::s4u::Host *host,
xbt_dynar_t
speedPerPstate, int core);
+ CpuTi(CpuTiModel *model, simgrid::s4u::Host *host,
std::vector<double> *
speedPerPstate, int core);
~CpuTi() override;
void setSpeedTrace(tmgr_trace_t trace) override;
~CpuTi() override;
void setSpeedTrace(tmgr_trace_t trace) override;
- void apply_event(tmgr_trace_
iterator
_t event, double value) override;
+ void apply_event(tmgr_trace_
event
_t event, double value) override;
void updateActionsFinishTime(double now);
void updateRemainingAmount(double now);
void updateActionsFinishTime(double now);
void updateRemainingAmount(double now);
@@
-135,7
+131,6
@@
public:
double currentFrequency_;
double currentFrequency_;
-public:
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
@@
-149,21
+144,13
@@
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
~CpuTiModel() override;
public:
CpuTiModel();
~CpuTiModel() override;
- Cpu *createCpu(simgrid::s4u::Host *host,
xbt_dynar_t
speedPerPstate, int core) override;
- double next
_occuring_e
vent(double now) override;
+ Cpu *createCpu(simgrid::s4u::Host *host,
std::vector<double>*
speedPerPstate, int core) override;
+ double next
OccuringE
vent(double now) override;
void updateActionsState(double now, double delta) override;
ActionList *runningActionSetThatDoesNotNeedBeingChecked_;
CpuTiList *modifiedCpu_;
xbt_heap_t tiActionHeap_;
void updateActionsState(double now, double delta) override;
ActionList *runningActionSetThatDoesNotNeedBeingChecked_;
CpuTiList *modifiedCpu_;
xbt_heap_t tiActionHeap_;
-
-protected:
- void NotifyResourceTurnedOn(simgrid::surf::Resource*){};
- void NotifyResourceTurnedOff(simgrid::surf::Resource*){};
-
- void NotifyActionCancel(Action*){};
- void NotifyActionResume(Action*){};
- void NotifyActionSuspend(Action*){};
};
}
};
}