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
remove a C-like pimple
[simgrid.git]
/
src
/
surf
/
host_interface.hpp
diff --git
a/src/surf/host_interface.hpp
b/src/surf/host_interface.hpp
index
01ceeb6
..
b69e1a8
100644
(file)
--- a/
src/surf/host_interface.hpp
+++ b/
src/surf/host_interface.hpp
@@
-52,7
+52,7
@@
public:
HostModel() : Model() {}
~HostModel() {}
HostModel() : Model() {}
~HostModel() {}
- Host *createHost(const char *name,
RoutingEdge
*net, Cpu *cpu, xbt_dict_t props);
+ Host *createHost(const char *name,
NetCard
*net, Cpu *cpu, xbt_dict_t props);
void addTraces() override {DIE_IMPOSSIBLE;}
virtual void adjustWeightOfDummyCpuActions();
void addTraces() override {DIE_IMPOSSIBLE;}
virtual void adjustWeightOfDummyCpuActions();
@@
-84,7
+84,6
@@
public:
static simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> onStateChange;
public:
static simgrid::surf::signal<void(simgrid::surf::Host*, e_surf_resource_state_t, e_surf_resource_state_t)> onStateChange;
public:
- static void classInit(); // must be called before the first use of that class
/**
* @brief Host constructor
*
/**
* @brief Host constructor
*
@@
-96,7
+95,7
@@
public:
* @param cpu The Cpu associated to this Host
*/
Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
* @param cpu The Cpu associated to this Host
*/
Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- xbt_dynar_t storage,
RoutingEdge
*netElm, Cpu *cpu);
+ xbt_dynar_t storage,
NetCard
*netElm, Cpu *cpu);
/**
* @brief Host constructor
/**
* @brief Host constructor
@@
-110,7
+109,7
@@
public:
* @param cpu The Cpu associated to this Host
*/
Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
* @param cpu The Cpu associated to this Host
*/
Host(simgrid::surf::Model *model, const char *name, xbt_dict_t props,
- lmm_constraint_t constraint, xbt_dynar_t storage,
RoutingEdge
*netElm,
+ lmm_constraint_t constraint, xbt_dynar_t storage,
NetCard
*netElm,
Cpu *cpu);
/* Host destruction logic */
Cpu *cpu);
/* Host destruction logic */
@@
-242,7
+241,7
@@
public:
public:
xbt_dynar_t p_storage;
public:
xbt_dynar_t p_storage;
-
RoutingEdge
*p_netElm;
+
NetCard
*p_netElm;
Cpu *p_cpu;
simgrid::Host* p_host = nullptr;
Cpu *p_cpu;
simgrid::Host* p_host = nullptr;