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
Use simgrid::Host instead of xbt_dictelt_t for root main object
[simgrid.git]
/
src
/
surf
/
vm_hl13.hpp
diff --git
a/src/surf/vm_hl13.hpp
b/src/surf/vm_hl13.hpp
index
411620d
..
ca0f380
100644
(file)
--- a/
src/surf/vm_hl13.hpp
+++ b/
src/surf/vm_hl13.hpp
@@
-33,15
+33,15
@@
public:
VMHL13Model();
~VMHL13Model(){};
VMHL13Model();
~VMHL13Model(){};
- VirtualMachine *createVM(const char *name, s
urf_resource_t host_PM)
;
+ VirtualMachine *createVM(const char *name, s
g_host_t host_PM) override
;
double shareResources(double now);
double shareResources(double now);
- void adjustWeightOfDummyCpuActions() {};
+ void adjustWeightOfDummyCpuActions()
override
{};
Action *executeParallelTask(int host_nb,
sg_host_t *host_list,
double *flops_amount,
double *bytes_amount,
Action *executeParallelTask(int host_nb,
sg_host_t *host_list,
double *flops_amount,
double *bytes_amount,
- double rate);
- void updateActionsState(double /*now*/, double /*delta*/);
+ double rate)
override
;
+ void updateActionsState(double /*now*/, double /*delta*/)
override
;
};
/************
};
/************
@@
-50,7
+50,7
@@
public:
class VMHL13 : public VirtualMachine {
public:
class VMHL13 : public VirtualMachine {
public:
- VMHL13(VMModel *model, const char* name, xbt_dict_t props, s
urf_resource
_t host_PM);
+ VMHL13(VMModel *model, const char* name, xbt_dict_t props, s
g_host
_t host_PM);
~VMHL13();
void suspend();
~VMHL13();
void suspend();
@@
-59,12
+59,12
@@
public:
void save();
void restore();
void save();
void restore();
- void migrate(s
urf_resource
_t ind_dst_pm);
+ void migrate(s
g_host
_t ind_dst_pm);
e_surf_resource_state_t getState();
void setState(e_surf_resource_state_t state);
e_surf_resource_state_t getState();
void setState(e_surf_resource_state_t state);
- s
urf_resource
_t getPm(); // will be vm_ws_get_pm()
+ s
g_host
_t getPm(); // will be vm_ws_get_pm()
void setBound(double bound);
void setAffinity(Cpu *cpu, unsigned long mask);
void setBound(double bound);
void setAffinity(Cpu *cpu, unsigned long mask);