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
Try to fix win build - may not be enough
[simgrid.git]
/
src
/
surf
/
ptask_L07.hpp
diff --git
a/src/surf/ptask_L07.hpp
b/src/surf/ptask_L07.hpp
index
74209df
..
403ad2b
100644
(file)
--- a/
src/surf/ptask_L07.hpp
+++ b/
src/surf/ptask_L07.hpp
@@
-54,9
+54,7
@@
public:
CpuL07Model(HostL07Model *hmodel,lmm_system_t sys);
~CpuL07Model();
CpuL07Model(HostL07Model *hmodel,lmm_system_t sys);
~CpuL07Model();
- Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPeakList,
- tmgr_trace_t speedTrace, int core,
- tmgr_trace_t state_trace) override;
+ Cpu *createCpu(simgrid::s4u::Host *host, xbt_dynar_t speedPerPstate, int core) override;
HostL07Model *p_hostModel;
};
HostL07Model *p_hostModel;
};
@@
-64,12
+62,7
@@
class NetworkL07Model : public NetworkModel {
public:
NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys);
~NetworkL07Model();
public:
NetworkL07Model(HostL07Model *hmodel, lmm_system_t sys);
~NetworkL07Model();
- Link* createLink(const char *name,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- tmgr_trace_t state_trace,
+ Link* createLink(const char *name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties) override;
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties) override;
@@
-85,8
+78,7
@@
public:
class CpuL07 : public Cpu {
public:
class CpuL07 : public Cpu {
public:
- CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedPeakList,
- tmgr_trace_t power_trace, int core, tmgr_trace_t state_trace);
+ CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, xbt_dynar_t speedList, int core);
~CpuL07();
bool isUsed() override;
void apply_event(tmgr_trace_iterator_t event, double value) override;
~CpuL07();
bool isUsed() override;
void apply_event(tmgr_trace_iterator_t event, double value) override;
@@
-99,12
+91,7
@@
protected:
class LinkL07 : public Link {
public:
LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
class LinkL07 : public Link {
public:
LinkL07(NetworkL07Model *model, const char* name, xbt_dict_t props,
- double bw_initial,
- tmgr_trace_t bw_trace,
- double lat_initial,
- tmgr_trace_t lat_trace,
- tmgr_trace_t state_trace,
- e_surf_link_sharing_policy_t policy);
+ double bandwidth, double latency, e_surf_link_sharing_policy_t policy);
~LinkL07(){ };
bool isUsed() override;
void apply_event(tmgr_trace_iterator_t event, double value) override;
~LinkL07(){ };
bool isUsed() override;
void apply_event(tmgr_trace_iterator_t event, double value) override;