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
Use std::vector for s_lmm_element_t::cnsts.
[simgrid.git]
/
src
/
surf
/
ptask_L07.hpp
diff --git
a/src/surf/ptask_L07.hpp
b/src/surf/ptask_L07.hpp
index
1b04286
..
3b944a3
100644
(file)
--- a/
src/surf/ptask_L07.hpp
+++ b/
src/surf/ptask_L07.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
5
. The SimGrid Team.
+/* Copyright (c) 2013-201
7
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-58,7
+58,8
@@
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 bandwidth, double latency, e_surf_link_sharing_policy_t policy) override;
+ LinkImpl* createLink(const std::string& name, double bandwidth, double latency,
+ e_surf_link_sharing_policy_t policy) override;
Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
@@
-72,22
+73,22
@@
public:
class CpuL07 : public Cpu {
public:
CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector<double> * speedPerPstate, int core);
class CpuL07 : public Cpu {
public:
CpuL07(CpuL07Model *model, simgrid::s4u::Host *host, std::vector<double> * speedPerPstate, int core);
- ~CpuL07();
+ ~CpuL07()
override
;
bool isUsed() override;
bool isUsed() override;
- void apply_event(tmgr_trace_
iterator
_t event, double value) override;
+ void apply_event(tmgr_trace_
event
_t event, double value) override;
Action *execution_start(double size) override;
Action *sleep(double duration) override;
protected:
void onSpeedChange() override;
};
Action *execution_start(double size) override;
Action *sleep(double duration) override;
protected:
void onSpeedChange() override;
};
-class LinkL07 : public Link {
+class LinkL07 : public Link
Impl
{
public:
public:
- LinkL07(NetworkL07Model* model, const
char*
name, double bandwidth, double latency,
+ LinkL07(NetworkL07Model* model, const
std::string&
name, double bandwidth, double latency,
e_surf_link_sharing_policy_t policy);
e_surf_link_sharing_policy_t policy);
- ~LinkL07()
{ }
;
+ ~LinkL07()
override
;
bool isUsed() override;
bool isUsed() override;
- void apply_event(tmgr_trace_
iterator
_t event, double value) override;
+ void apply_event(tmgr_trace_
event
_t event, double value) override;
void setBandwidth(double value) override;
void setLatency(double value) override;
};
void setBandwidth(double value) override;
void setLatency(double value) override;
};
@@
-108,7
+109,7
@@
public:
int unref() override;
int unref() override;
- std::vector<
kernel::routing::NetCard*> * netcardList_ = new std::vector<kernel::routing::NetCard
*>();
+ std::vector<
s4u::Host*>* hostList_ = new std::vector<s4u::Host
*>();
double *computationAmount_;
double *communicationAmount_;
double latency_;
double *computationAmount_;
double *communicationAmount_;
double latency_;