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
stringify a bit
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
bf841ed
..
4bdbe14
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-4,11
+4,12
@@
/* 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. */
/* 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"
#include "src/surf/trace_mgr.hpp"
#include <xbt/base.h>
#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
@@
-32,7
+33,7
@@
struct tiTag;
*********/
class CpuTiTrace {
public:
*********/
class CpuTiTrace {
public:
- CpuTiTrace(tmgr_trace_t speedTrace);
+
explicit
CpuTiTrace(tmgr_trace_t speedTrace);
~CpuTiTrace();
double integrateSimple(double a, double b);
~CpuTiTrace();
double integrateSimple(double a, double b);
@@
-84,21
+85,18
@@
class CpuTiAction: public CpuAction {
public:
CpuTiAction(CpuTiModel *model, double cost, bool failed, CpuTi *cpu);
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;
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;
};
@@
-110,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();
+ CpuTi(CpuTiModel *model, simgrid::s4u::Host *host,
std::vector<double> *
speedPerPstate, int core);
+ ~CpuTi()
override
;
void setSpeedTrace(tmgr_trace_t trace) 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);
@@
-126,14
+124,13
@@
public:
void modified(bool modified);
void modified(bool modified);
- CpuTiTgmr *speedIntegratedTrace_ =
NULL
;/*< Structure with data needed to integrate trace file */
- ActionTiList *actionSet_ =
NULL
; /*< set with all actions running on cpu */
+ 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_;
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_;
-public:
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
boost::intrusive::list_member_hook<> cpu_ti_hook;
};
@@
-146,22
+143,14
@@
typedef boost::intrusive::list<CpuTi, CpuTiListOptions> CpuTiList;
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
class CpuTiModel : public CpuModel {
public:
CpuTiModel();
- ~CpuTiModel();
- Cpu *createCpu(simgrid::s4u::Host *host,
xbt_dynar_t
speedPerPstate, int core) override;
- double next
_occuring_e
vent(double now) override;
+ ~CpuTiModel()
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*){};
};
}
};
}