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
Revert "msg_private.h is a C++ header so add pp"
[simgrid.git]
/
src
/
surf
/
cpu_ti.hpp
diff --git
a/src/surf/cpu_ti.hpp
b/src/surf/cpu_ti.hpp
index
bf841ed
..
b99ecd3
100644
(file)
--- a/
src/surf/cpu_ti.hpp
+++ b/
src/surf/cpu_ti.hpp
@@
-4,6
+4,8
@@
/* 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 <xbt/base.h>
#include "src/surf/cpu_interface.hpp"
@@
-32,7
+34,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,7
+86,7
@@
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;
void updateIndexHeap(int i);
int unref() override;
void cancel() override;
void updateIndexHeap(int i);
@@
-93,7
+95,6
@@
public:
void setMaxDuration(double duration) override;
void setPriority(double priority) override;
double getRemains() override;
void setMaxDuration(double duration) override;
void setPriority(double priority) override;
double getRemains() override;
- void setAffinity(Cpu * /*cpu*/, unsigned long /*mask*/) override {};
CpuTi *cpu_;
int indexHeap_;
CpuTi *cpu_;
int indexHeap_;
@@
-110,8
+111,8
@@
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;
@@
-126,8
+127,8
@@
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 sumPriority_ = 0; /*< the sum of actions' priority that are running on cpu */
double lastUpdate_ = 0; /*< last update of actions' remaining amount done */
@@
-146,8
+147,8
@@
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;
+ ~CpuTiModel()
override
;
+ Cpu *createCpu(simgrid::s4u::Host *host,
std::vector<double>*
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;