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
give a default value at field declaration, not everywhere in subclasses
[simgrid.git]
/
src
/
surf
/
vm_hl13.hpp
diff --git
a/src/surf/vm_hl13.hpp
b/src/surf/vm_hl13.hpp
index
419a826
..
2244a38
100644
(file)
--- a/
src/surf/vm_hl13.hpp
+++ b/
src/surf/vm_hl13.hpp
@@
-4,8
+4,10
@@
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
+#include "xbt/base.h"
+
#include "host_clm03.hpp"
#include "host_clm03.hpp"
-#include "v
m_interfac
e.hpp"
+#include "v
irtual_machin
e.hpp"
#ifndef SURF_VM_HPP_
#define SURF_VM_HPP_
#ifndef SURF_VM_HPP_
#define SURF_VM_HPP_
@@
-13,12
+15,15
@@
#define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM
// It corresponds to the cost of a VM running no tasks.
#define GUESTOS_NOISE 100 // This value corresponds to the cost of the global action associated to the VM
// It corresponds to the cost of a VM running no tasks.
+namespace simgrid {
+namespace surf {
+
/***********
* Classes *
***********/
/***********
* Classes *
***********/
-class VMHL13Model;
-class VMHL13;
+class
XBT_PRIVATE
VMHL13Model;
+class
XBT_PRIVATE
VMHL13;
/*********
* Model *
/*********
* Model *
@@
-28,39
+33,37
@@
public:
VMHL13Model();
~VMHL13Model(){};
VMHL13Model();
~VMHL13Model(){};
- V
M *createVM(const char *name, surf_resource_t host_PM)
;
+ V
irtualMachine *createVM(const char *name, sg_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
;
};
/************
* Resource *
************/
};
/************
* Resource *
************/
-class VMHL13 : public V
M
{
+class VMHL13 : public V
irtualMachine
{
public:
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();
~VMHL13();
- void suspend();
- void resume();
+ void suspend()
override
;
+ void resume()
override
;
- void save();
- void restore();
+ void save()
override
;
+ void restore()
override
;
- void migrate(s
urf_resource_t ind_dst_pm)
;
+ void migrate(s
g_host_t ind_dst_pm) override
;
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);
- surf_resource_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);
@@
-76,4
+79,7
@@
public:
* Action *
**********/
* Action *
**********/
+}
+}
+
#endif /* SURF_VM_HPP_ */
#endif /* SURF_VM_HPP_ */