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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
surf
/
HostImpl.hpp
diff --git
a/src/surf/HostImpl.hpp
b/src/surf/HostImpl.hpp
index
6612221
..
058140b
100644
(file)
--- a/
src/surf/HostImpl.hpp
+++ b/
src/surf/HostImpl.hpp
@@
-52,7
+52,7
@@
public:
HostModel() : Model() {}
~HostModel() override {}
HostModel() : Model() {}
~HostModel() override {}
- HostImpl *createHost(const char *name, NetCard *net, Cpu *cpu
, xbt_dict_t props
);
+ HostImpl *createHost(const char *name, NetCard *net, Cpu *cpu);
virtual void adjustWeightOfDummyCpuActions();
virtual Action *executeParallelTask(int host_nb, sg_host_t *host_list,
virtual void adjustWeightOfDummyCpuActions();
virtual Action *executeParallelTask(int host_nb, sg_host_t *host_list,
@@
-85,7
+85,7
@@
public:
* @param storage The Storage associated to this Host
* @param cpu The Cpu associated to this Host
*/
* @param storage The Storage associated to this Host
* @param cpu The Cpu associated to this Host
*/
- HostImpl(HostModel *model, const char *name, xbt_d
ict_t props, xbt_d
ynar_t storage, Cpu *cpu);
+ HostImpl(HostModel *model, const char *name, xbt_dynar_t storage, Cpu *cpu);
/**
* @brief Host constructor
/**
* @brief Host constructor
@@
-97,7
+97,7
@@
public:
* @param storage The Storage associated to this Host
* @param cpu The Cpu associated to this Host
*/
* @param storage The Storage associated to this Host
* @param cpu The Cpu associated to this Host
*/
- HostImpl(HostModel *model, const char *name,
xbt_dict_t props,
+ HostImpl(HostModel *model, const char *name,
lmm_constraint_t constraint, xbt_dynar_t storage, Cpu *cpu);
/* Host destruction logic */
lmm_constraint_t constraint, xbt_dynar_t storage, Cpu *cpu);
/* Host destruction logic */