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
uniformization of the conversion of task state to string
[simgrid.git]
/
src
/
surf
/
HostImpl.hpp
diff --git
a/src/surf/HostImpl.hpp
b/src/surf/HostImpl.hpp
index c423c9123de528a5205a0f4e22416ad545ac7433..62f6178f79e3ddd835b212c37ce9b2321ed5a350 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);
+ HostImpl *createHost(const char *name,
kernel::routing::
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,
@@
-100,9
+100,10
@@
public:
/* Host destruction logic */
/**************************/
/* Host destruction logic */
/**************************/
- ~HostImpl();
+ ~HostImpl()
override
;
public:
public:
+ // Overload the method for covariant return type:
HostModel *getModel()
{
return static_cast<HostModel*>(Resource::getModel());
HostModel *getModel()
{
return static_cast<HostModel*>(Resource::getModel());
@@
-228,7
+229,7
@@
public:
public:
xbt_dynar_t p_storage;
Cpu *p_cpu;
public:
xbt_dynar_t p_storage;
Cpu *p_cpu;
- simgrid::s4u::Host* p
_host
= nullptr;
+ simgrid::s4u::Host* p
iface
= nullptr;
/** @brief Get the list of virtual machines on the current Host */
xbt_dynar_t getVms();
/** @brief Get the list of virtual machines on the current Host */
xbt_dynar_t getVms();
@@
-239,7
+240,7
@@
public:
void getParams(vm_params_t params);
/** @brief Sets the params of that VM/PM */
void setParams(vm_params_t params);
void getParams(vm_params_t params);
/** @brief Sets the params of that VM/PM */
void setParams(vm_params_t params);
- simgrid::s4u::Host* getHost() { return p
_host
; }
+ simgrid::s4u::Host* getHost() { return p
iface
; }
private:
s_vm_params_t p_params;
};
private:
s_vm_params_t p_params;
};