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
cosmetics around surf::Resouce::apply_event()
[simgrid.git]
/
src
/
surf
/
cpu_cas01.hpp
diff --git
a/src/surf/cpu_cas01.hpp
b/src/surf/cpu_cas01.hpp
index
04d2896
..
d2022aa
100644
(file)
--- a/
src/surf/cpu_cas01.hpp
+++ b/
src/surf/cpu_cas01.hpp
@@
-32,8
+32,7
@@
public:
tmgr_trace_t speedTrace, int core,
int initiallyOn,
tmgr_trace_t state_trace) override;
tmgr_trace_t speedTrace, int core,
int initiallyOn,
tmgr_trace_t state_trace) override;
- double shareResourcesFull(double now) override;
- void addTraces() override;
+ double next_occuring_event_full(double now) override;
ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
};
ActionList *p_cpuRunningActionSetThatDoesNotNeedBeingChecked;
};
@@
-47,30
+46,23
@@
public:
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuCas01();
int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
int initiallyOn, tmgr_trace_t stateTrace) ;
~CpuCas01();
- void
updateState(tmgr_trace_iterator_t event_type, double value, double dat
e) override;
- CpuAction *execut
e
(double size) override;
+ void
apply_event(tmgr_trace_iterator_t event, double valu
e) override;
+ CpuAction *execut
ion_start
(double size) override;
CpuAction *sleep(double duration) override;
bool isUsed() override;
CpuAction *sleep(double duration) override;
bool isUsed() override;
- void setStateEvent(tmgr_trace_iterator_t stateEvent);
- void setPowerEvent(tmgr_trace_iterator_t stateEvent);
xbt_dynar_t getSpeedPeakList(); // FIXME: killme to hide our internals
protected:
void onSpeedChange() override;
xbt_dynar_t getSpeedPeakList(); // FIXME: killme to hide our internals
protected:
void onSpeedChange() override;
-
-private:
-
- tmgr_trace_iterator_t p_stateEvent;
- tmgr_trace_iterator_t p_speedEvent;
};
/**********
* Action *
**********/
class CpuCas01Action: public CpuAction {
};
/**********
* Action *
**********/
class CpuCas01Action: public CpuAction {
- friend CpuAction *CpuCas01::execut
e
(double size);
+ friend CpuAction *CpuCas01::execut
ion_start
(double size);
friend CpuAction *CpuCas01::sleep(double duration);
public:
CpuCas01Action(Model *model, double cost, bool failed, double speed,
friend CpuAction *CpuCas01::sleep(double duration);
public:
CpuCas01Action(Model *model, double cost, bool failed, double speed,