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
Sanitize the network_model->communicate() API
[simgrid.git]
/
src
/
surf
/
ptask_L07.hpp
diff --git
a/src/surf/ptask_L07.hpp
b/src/surf/ptask_L07.hpp
index
1fc2a88
..
e1aa4bb
100644
(file)
--- a/
src/surf/ptask_L07.hpp
+++ b/
src/surf/ptask_L07.hpp
@@
-5,11
+5,8
@@
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <cstdlib>
* under the terms of the license (GNU LGPL) which comes with this package. */
#include <cstdlib>
-
#include <vector>
#include <vector>
-
#include <xbt/base.h>
#include <xbt/base.h>
-
#include "src/surf/HostImpl.hpp"
#ifndef HOST_L07_HPP_
#include "src/surf/HostImpl.hpp"
#ifndef HOST_L07_HPP_
@@
-42,11
+39,10
@@
public:
HostL07Model();
~HostL07Model();
HostL07Model();
~HostL07Model();
- double next
_occuring_e
vent(double now) override;
+ double next
OccuringE
vent(double now) override;
void updateActionsState(double now, double delta) override;
Action *executeParallelTask(int host_nb, sg_host_t *host_list,
void updateActionsState(double now, double delta) override;
Action *executeParallelTask(int host_nb, sg_host_t *host_list,
- double *flops_amount, double *bytes_amount,
- double rate) override;
+ double *flops_amount, double *bytes_amount, double rate) override;
};
class CpuL07Model : public CpuModel {
};
class CpuL07Model : public CpuModel {
@@
-54,8
+50,8
@@
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 speedsList
, int core) override;
- HostL07Model *
p_hostModel
;
+ Cpu *createCpu(simgrid::s4u::Host *host,
std::vector<double> *speedPerPstate
, int core) override;
+ HostL07Model *
hostModel_
;
};
class NetworkL07Model : public NetworkModel {
};
class NetworkL07Model : public NetworkModel {
@@
-66,10
+62,9
@@
public:
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties) override;
e_surf_link_sharing_policy_t policy,
xbt_dict_t properties) override;
- Action *communicate(NetCard *src, NetCard *dst, double size, double rate) override;
- bool next_occuring_event_isIdempotent() override {return true;}
+ Action* communicate(s4u::Host* src, s4u::Host* dst, double size, double rate) override;
- HostL07Model *
p_hostModel
;
+ HostL07Model *
hostModel_
;
};
/************
};
/************
@@
-78,7
+73,7
@@
public:
class CpuL07 : public Cpu {
public:
class CpuL07 : public Cpu {
public:
- CpuL07(CpuL07Model *model, simgrid::s4u::Host *host,
xbt_dynar_t speedList
, int core);
+ CpuL07(CpuL07Model *model, simgrid::s4u::Host *host,
std::vector<double> * speedPerPstate
, 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;
@@
-105,28
+100,21
@@
public:
class L07Action : public CpuAction {
friend Action *CpuL07::execution_start(double size);
friend Action *CpuL07::sleep(double duration);
class L07Action : public CpuAction {
friend Action *CpuL07::execution_start(double size);
friend Action *CpuL07::sleep(double duration);
- friend Action *HostL07Model::executeParallelTask(int host_nb,
- sg_host_t*host_list,
- double *flops_amount,
- double *bytes_amount,
- double rate);
+ friend Action *HostL07Model::executeParallelTask(int host_nb, sg_host_t*host_list,
+ double *flops_amount, double *bytes_amount, double rate);
public:
public:
- L07Action(Model *model, int host_nb,
- sg_host_t*host_list,
- double *flops_amount,
- double *bytes_amount,
- double rate);
+ L07Action(Model *model, int host_nb, sg_host_t *host_list, double *flops_amount, double *bytes_amount, double rate);
~L07Action();
void updateBound();
int unref() override;
~L07Action();
void updateBound();
int unref() override;
- std::vector<
NetCard*> * p_netcardList = new std::vector<
NetCard*>();
- double *
p_computationAmount
;
- double *
p_communicationAmount
;
- double
m_latency
;
- double
m_rate
;
+ std::vector<
kernel::routing::NetCard*> * netcardList_ = new std::vector<kernel::routing::
NetCard*>();
+ double *
computationAmount_
;
+ double *
communicationAmount_
;
+ double
latency_
;
+ double
rate_
;
};
}
};
}