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
guess what? bugs and smells
[simgrid.git]
/
src
/
surf
/
HostImpl.hpp
diff --git
a/src/surf/HostImpl.hpp
b/src/surf/HostImpl.hpp
index
6612221
..
62f6178
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,
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,
@@
-81,30
+81,29
@@
public:
*
* @param model HostModel associated to this Host
* @param name The name of the Host
*
* @param model HostModel associated to this Host
* @param name The name of the Host
- * @param props Dictionary of properties associated to this Host
* @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
*
* @param model HostModel associated to this Host
* @param name The name of the Host
/**
* @brief Host constructor
*
* @param model HostModel associated to this Host
* @param name The name of the Host
- * @param props Dictionary of properties associated to this Host
* @param constraint The lmm constraint associated to this Host if it is part of a LMM component
* @param storage The Storage associated to this Host
* @param cpu The Cpu associated to this Host
*/
* @param constraint The lmm constraint associated to this Host if it is part of a LMM component
* @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 */
/**************************/
- ~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());
@@
-177,7
+176,7
@@
public:
virtual Action *write(surf_file_t fd, sg_size_t size);
/**
virtual Action *write(surf_file_t fd, sg_size_t size);
/**
- * @brief Get the information
s
of a file descriptor
+ * @brief Get the information of a file descriptor
* @details The returned xbt_dynar_t contains:
* - the size of the file,
* - the mount point,
* @details The returned xbt_dynar_t contains:
* - the size of the file,
* - the mount point,
@@
-186,7
+185,7
@@
public:
* - the storage content type
*
* @param fd The file descriptor
* - the storage content type
*
* @param fd The file descriptor
- * @return An xbt_dynar_t with the file information
s
+ * @return An xbt_dynar_t with the file information
*/
virtual xbt_dynar_t getInfo(surf_file_t fd);
*/
virtual xbt_dynar_t getInfo(surf_file_t fd);
@@
-230,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();
@@
-241,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;
};