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 'condvar'
[simgrid.git]
/
src
/
surf
/
vm_hl13.hpp
diff --git
a/src/surf/vm_hl13.hpp
b/src/surf/vm_hl13.hpp
index
6b0d8b2
..
3bcd9b8
100644
(file)
--- a/
src/surf/vm_hl13.hpp
+++ b/
src/surf/vm_hl13.hpp
@@
-34,7
+34,7
@@
public:
~VMHL13Model(){};
VirtualMachine *createVM(const char *name, sg_host_t host_PM) override;
~VMHL13Model(){};
VirtualMachine *createVM(const char *name, sg_host_t host_PM) override;
- double
shareResources
(double now) override;
+ double
next_occuring_event
(double now) override;
void adjustWeightOfDummyCpuActions() override {};
void updateActionsState(double /*now*/, double /*delta*/) override;
};
void adjustWeightOfDummyCpuActions() override {};
void updateActionsState(double /*now*/, double /*delta*/) override;
};
@@
-45,8
+45,8
@@
public:
class VMHL13 : public VirtualMachine {
public:
class VMHL13 : public VirtualMachine {
public:
- VMHL13(VMModel *model, const char* name,
xbt_dict_t props,
sg_host_t host_PM);
- ~VMHL13()
{}
+ VMHL13(VMModel *model, const char* name, sg_host_t host_PM);
+ ~VMHL13()
;
void suspend() override;
void resume() override;
void suspend() override;
void resume() override;