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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
1f8bb91
..
9d3491d
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-39,9
+39,9
@@
public:
double integrateSimplePoint(double a);
double solveSimple(double a, double amount);
double integrateSimplePoint(double a);
double solveSimple(double a, double amount);
- double *
p_timePoints
;
- double *
p_integral
;
- int
m_nbPoints
;
+ double *
timePoints_
;
+ double *
integral_
;
+ int
nbPoints_
;
int binarySearch(double *array, double a, int low, int high);
};
int binarySearch(double *array, double a, int low, int high);
};
@@
-54,7
+54,7
@@
enum trace_type {
class CpuTiTgmr {
public:
CpuTiTgmr(trace_type type, double value)
class CpuTiTgmr {
public:
CpuTiTgmr(trace_type type, double value)
- :
m_type(type), m_value
(value)
+ :
type_(type), value_
(value)
{};
CpuTiTgmr(tmgr_trace_t speedTrace, double value);
~CpuTiTgmr();
{};
CpuTiTgmr(tmgr_trace_t speedTrace, double value);
~CpuTiTgmr();
@@
-64,15
+64,15
@@
public:
double solveSomewhatSimple(double a, double amount);
double getPowerScale(double a);
double solveSomewhatSimple(double a, double amount);
double getPowerScale(double a);
- trace_type
m_type
;
- double
m_value
; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
+ trace_type
type_
;
+ double
value_
; /*< Percentage of cpu speed available. Value fixed between 0 and 1 */
/* Dynamic */
/* Dynamic */
- double
m_lastTime
= 0.0; /*< Integral interval last point (discrete time) */
- double
m_total = 0.0;
/*< Integral total between 0 and last_pointn */
+ double
lastTime_
= 0.0; /*< Integral interval last point (discrete time) */
+ double
total_ = 0.0;
/*< Integral total between 0 and last_pointn */
- CpuTiTrace *
p_trace
= nullptr;
- tmgr_trace_t
p_speedTrace
= nullptr;
+ CpuTiTrace *
trace_
= nullptr;
+ tmgr_trace_t
speedTrace_
= nullptr;
};
/**********
};
/**********
@@
-82,10
+82,9
@@
public:
class CpuTiAction: public CpuAction {
friend class CpuTi;
public:
class CpuTiAction: public CpuAction {
friend class CpuTi;
public:
- CpuTiAction(CpuTiModel *model, double cost, bool failed,
- CpuTi *cpu);
+ 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);
int unref() override;
void cancel() override;
void updateIndexHeap(int i);
@@
-96,29
+95,25
@@
public:
double getRemains() override;
void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {};
double getRemains() override;
void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {};
- CpuTi *
p_cpu
;
- int
m_indexHeap
;
- int
m_suspended
= 0;
+ CpuTi *
cpu_
;
+ int
indexHeap_
;
+ int
suspended_
= 0;
public:
boost::intrusive::list_member_hook<> action_ti_hook;
};
public:
boost::intrusive::list_member_hook<> action_ti_hook;
};
-typedef boost::intrusive::member_hook<
- CpuTiAction, boost::intrusive::list_member_hook<>, &CpuTiAction::action_ti_hook> ActionTiListOptions;
-typedef boost::intrusive::list<
- CpuTiAction, ActionTiListOptions > ActionTiList;
+typedef boost::intrusive::member_hook<CpuTiAction, boost::intrusive::list_member_hook<>, &CpuTiAction::action_ti_hook> ActionTiListOptions;
+typedef boost::intrusive::list<CpuTiAction, ActionTiListOptions > ActionTiList;
/************
* Resource *
************/
class CpuTi : public Cpu {
public:
/************
* Resource *
************/
class CpuTi : public Cpu {
public:
- CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- int pstate, double speedScale, tmgr_trace_t speedTrace, int core,
- int initiallyOn, tmgr_trace_t stateTrace) ;
+ CpuTi(CpuTiModel *model, simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core);
~CpuTi();
~CpuTi();
- void set
_speed_t
race(tmgr_trace_t trace) override;
+ void set
SpeedT
race(tmgr_trace_t trace) override;
void apply_event(tmgr_trace_iterator_t event, double value) override;
void updateActionsFinishTime(double now);
void apply_event(tmgr_trace_iterator_t event, double value) override;
void updateActionsFinishTime(double now);
@@
-131,19
+126,18
@@
public:
void modified(bool modified);
void modified(bool modified);
- CpuTiTgmr *
p_availTrace;
/*< Structure with data needed to integrate trace file */
- ActionTiList *
p_actionSet
; /*< set with all actions running on cpu */
- double
m_sumPriority;
/*< the sum of actions' priority that are running on cpu */
- double
m_lastUpdate = 0;
/*< last update of actions' remaining amount done */
+ CpuTiTgmr *
speedIntegratedTrace_ = NULL;
/*< Structure with data needed to integrate trace file */
+ ActionTiList *
actionSet_ = NULL
; /*< 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 current
_frequency
;
+ double current
Frequency_
;
public:
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
public:
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
-typedef boost::intrusive::member_hook<
- CpuTi, boost::intrusive::list_member_hook<>, &CpuTi::cpu_ti_hook> CpuTiListOptions;
+typedef boost::intrusive::member_hook<CpuTi, boost::intrusive::list_member_hook<>, &CpuTi::cpu_ti_hook> CpuTiListOptions;
typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
/*********
typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
/*********
@@
-153,16
+147,13
@@
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
~CpuTiModel();
public:
CpuTiModel();
~CpuTiModel();
- Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeak,
- int pstate, double speedScale,
- tmgr_trace_t speedTrace, int core,
- int initiallyOn, tmgr_trace_t state_trace) override;
+ Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) override;
double next_occuring_event(double now) override;
void updateActionsState(double now, double delta) override;
double next_occuring_event(double now) override;
void updateActionsState(double now, double delta) override;
- ActionList *
p_runningActionSetThatDoesNotNeedBeingChecked
;
- CpuTiList *
p_modifiedCpu
;
- xbt_heap_t
p_tiActionHeap
;
+ ActionList *
runningActionSetThatDoesNotNeedBeingChecked_
;
+ CpuTiList *
modifiedCpu_
;
+ xbt_heap_t
tiActionHeap_
;
protected:
void NotifyResourceTurnedOn(simgrid::surf::Resource*){};
protected:
void NotifyResourceTurnedOn(simgrid::surf::Resource*){};